diff options
Diffstat (limited to 'examples')
48 files changed, 452 insertions, 196 deletions
diff --git a/examples/org.eclipse.emf.activities/.project b/examples/org.eclipse.emf.activities/.project index 7741a3ca7..4c1b79187 100644 --- a/examples/org.eclipse.emf.activities/.project +++ b/examples/org.eclipse.emf.activities/.project @@ -16,30 +16,34 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.oomph.version.VersionBuilder</name> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> - <key>ignore.schema.builder</key> - <value>true</value> + <key>LaunchConfigHandle</key> + <value><project>/.externalToolBuilders/org.eclipse.emf.activities.launch</value> </dictionary> <dictionary> - <key>release.path</key> - <value>/org.eclipse.emf.java/release.xml</value> + <key>incclean</key> + <value>true</value> </dictionary> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>auto,full,incremental,</triggers> + <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/org.eclipse.emf.activities.launch</value> + <key>check.maven.pom</key> + <value>true</value> </dictionary> <dictionary> - <key>incclean</key> + <key>ignore.schema.builder</key> <value>true</value> </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.emf.java/release.xml</value> + </dictionary> </arguments> </buildCommand> </buildSpec> diff --git a/examples/org.eclipse.emf.activities/pom.xml b/examples/org.eclipse.emf.activities/pom.xml new file mode 100644 index 000000000..ff9535a79 --- /dev/null +++ b/examples/org.eclipse.emf.activities/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.plugins</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.emf.parent/plugins</relativePath> + </parent> + + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.activities</artifactId> + <version>2.6.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +</project> diff --git a/examples/org.eclipse.emf.examples-feature/.project b/examples/org.eclipse.emf.examples-feature/.project index aebfae471..f0093459d 100644 --- a/examples/org.eclipse.emf.examples-feature/.project +++ b/examples/org.eclipse.emf.examples-feature/.project @@ -14,7 +14,7 @@ <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> <dictionary> - <key>ignore.missing.dependency.ranges</key> + <key>check.maven.pom</key> <value>true</value> </dictionary> <dictionary> @@ -22,6 +22,10 @@ <value>true</value> </dictionary> <dictionary> + <key>ignore.schema.builder</key> + <value>true</value> + </dictionary> + <dictionary> <key>release.path</key> <value>/org.eclipse.emf.java/release.xml</value> </dictionary> diff --git a/examples/org.eclipse.emf.examples-feature/build.properties b/examples/org.eclipse.emf.examples-feature/build.properties index 8a80acfc1..22f7e76dd 100644 --- a/examples/org.eclipse.emf.examples-feature/build.properties +++ b/examples/org.eclipse.emf.examples-feature/build.properties @@ -1,4 +1,3 @@ bin.includes = feature.xml,\ - feature.properties,\ - eclipse_update_120.jpg + feature.properties generate.feature@org.eclipse.emf.examples.source=org.eclipse.emf.examples, exclude@org.eclipse.emf.activities diff --git a/examples/org.eclipse.emf.examples-feature/feature.properties b/examples/org.eclipse.emf.examples-feature/feature.properties index 1cb460310..4d94b93ab 100644 --- a/examples/org.eclipse.emf.examples-feature/feature.properties +++ b/examples/org.eclipse.emf.examples-feature/feature.properties @@ -20,4 +20,4 @@ providerName=Eclipse Modeling Project # "description" property - description of the feature description=Example EMF models and tools illustrating how to use the framework. -ModelingUpdateSiteName=Eclipse Modeling Project Updates +EMFUpdateSiteName=Eclipse Modeling Framework Updates diff --git a/examples/org.eclipse.emf.examples-feature/feature.xml b/examples/org.eclipse.emf.examples-feature/feature.xml index dcb73b6ef..167a6e090 100644 --- a/examples/org.eclipse.emf.examples-feature/feature.xml +++ b/examples/org.eclipse.emf.examples-feature/feature.xml @@ -5,14 +5,14 @@ version="2.13.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.emf.license" - license-feature-version="2.8.0.qualifier"> + license-feature-version="2.9.0.qualifier"> <description> %description </description> <copyright> - Copyright (c) 2004-2011 IBM Corporation and others. + Copyright (c) 2004-2018 IBM Corporation and others. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at @@ -24,14 +24,10 @@ http://www.eclipse.org/legal/epl-v10.html </license> <url> - <update label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> - <discovery label="%ModelingUpdateSiteName" url="http://www.eclipse.org/modeling/updates/"/> + <update label="%EMFUpdateSiteName" url="http://download.eclipse.org/modeling/emf/emf/builds/"/> + <discovery label="%EMFUpdateSiteName" url="http://download.eclipse.org/modeling/emf/emf/builds/"/> </url> - <includes - id="org.eclipse.emf.examples.source" - version="0.0.0"/> - <plugin id="org.eclipse.emf.examples" download-size="0" diff --git a/examples/org.eclipse.emf.examples-feature/pom.xml b/examples/org.eclipse.emf.examples-feature/pom.xml new file mode 100644 index 000000000..9bdcd478a --- /dev/null +++ b/examples/org.eclipse.emf.examples-feature/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.features</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.emf.parent/features</relativePath> + </parent> + + <groupId>org.eclipse.emf.features</groupId> + <artifactId>org.eclipse.emf.examples</artifactId> + <version>2.13.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> + +</project> diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/.project b/examples/org.eclipse.emf.examples.databinding.project.core.model/.project index 82ddfb7be..294bfcbf7 100644 --- a/examples/org.eclipse.emf.examples.databinding.project.core.model/.project +++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/.project @@ -24,7 +24,7 @@ <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> <dictionary> - <key>ignore.missing.dependency.ranges</key> + <key>check.maven.pom</key> <value>true</value> </dictionary> <dictionary> diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.databinding.project.core.model/META-INF/MANIFEST.MF index c3480b097..ffb4bdc5a 100644 --- a/examples/org.eclipse.emf.examples.databinding.project.core.model/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.examples.databinding.project.core.model;singleton:=true -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 1.2.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,6 +10,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.emf.examples.databinding.project.core.model.project, org.eclipse.emf.examples.databinding.project.core.model.project.impl, org.eclipse.emf.examples.databinding.project.core.model.project.util -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/examples/org.eclipse.emf.examples.databinding.project.core.model/pom.xml b/examples/org.eclipse.emf.examples.databinding.project.core.model/pom.xml new file mode 100644 index 000000000..f4f17ef4f --- /dev/null +++ b/examples/org.eclipse.emf.examples.databinding.project.core.model/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.plugins</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.emf.parent/plugins</relativePath> + </parent> + + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.examples.databinding.project.core.model</artifactId> + <version>1.2.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +</project> diff --git a/examples/org.eclipse.emf.examples.databinding.project.core/.project b/examples/org.eclipse.emf.examples.databinding.project.core/.project index cef542c33..42d65e0f4 100644 --- a/examples/org.eclipse.emf.examples.databinding.project.core/.project +++ b/examples/org.eclipse.emf.examples.databinding.project.core/.project @@ -29,7 +29,7 @@ <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> <dictionary> - <key>ignore.missing.dependency.ranges</key> + <key>check.maven.pom</key> <value>true</value> </dictionary> <dictionary> diff --git a/examples/org.eclipse.emf.examples.databinding.project.core/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.databinding.project.core/META-INF/MANIFEST.MF index e58d8fb20..5c41e52d9 100644 --- a/examples/org.eclipse.emf.examples.databinding.project.core/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.emf.examples.databinding.project.core/META-INF/MANIFEST.MF @@ -4,11 +4,11 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.emf.examples.databinding.project.core -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 1.1.0.qualifier Bundle-Activator: org.eclipse.emf.examples.databinding.project.core.internal.Activator -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore.xmi, - org.eclipse.emf.edit +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)", + org.eclipse.emf.edit;bundle-version="[2.13.0,3.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.emf.examples.databinding.project.core diff --git a/examples/org.eclipse.emf.examples.databinding.project.core/pom.xml b/examples/org.eclipse.emf.examples.databinding.project.core/pom.xml new file mode 100644 index 000000000..33ede1991 --- /dev/null +++ b/examples/org.eclipse.emf.examples.databinding.project.core/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.plugins</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.emf.parent/plugins</relativePath> + </parent> + + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.examples.databinding.project.core</artifactId> + <version>1.1.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +</project> diff --git a/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/.project b/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/.project index 6477f0528..626c071fa 100644 --- a/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/.project +++ b/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/.project @@ -29,7 +29,7 @@ <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> <dictionary> - <key>ignore.missing.dependency.ranges</key> + <key>check.maven.pom</key> <value>true</value> </dictionary> <dictionary> diff --git a/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/App.launch b/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/App.launch index eadc6b02f..2a6b5da14 100644 --- a/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/App.launch +++ b/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/App.launch @@ -15,13 +15,13 @@ <booleanAttribute key="includeOptional" value="true"/> <stringAttribute key="location" value="${workspace_loc}/../runtime-org.eclipse.emf.examples.databinding.project.ui.rcp.application"/> <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/> -<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 [1.6.0_65-b14-466.1]"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JRE for J2SE-1.5"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <booleanAttribute key="pde.generated.config" value="false"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.emf.cdo.server.product"/> -<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.servlet@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.macosx@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@default:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt.cocoa.macosx.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.cocoa@default:false,org.eclipse.ui.forms@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default"/> +<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,javax.servlet@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@default:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.util@default:default,org.eclipse.help@default:default,org.eclipse.jface@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default"/> <stringAttribute key="selected_workspace_plugins" value="org.eclipse.emf.common@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.examples.databinding.project.core.model@default:default,org.eclipse.emf.examples.databinding.project.core@default:default,org.eclipse.emf.examples.databinding.project.ui.rcp@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> diff --git a/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/META-INF/MANIFEST.MF index 6f2f8ee52..782e1c0de 100644 --- a/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/META-INF/MANIFEST.MF @@ -6,17 +6,17 @@ Bundle-Localization: plugin Bundle-SymbolicName: org.eclipse.emf.examples.databinding.project.ui.rcp;singleton:=true Bundle-Version: 1.3.0.qualifier Bundle-Activator: org.eclipse.emf.example.databinding.project.ui.rcp.Activator -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.core.databinding, - org.eclipse.core.databinding.property, - org.eclipse.jface.databinding, - org.eclipse.ui.forms, - org.eclipse.emf.databinding, - org.eclipse.emf.databinding.edit, - org.eclipse.emf.examples.databinding.project.core;bundle-version="1.0.0", - org.eclipse.core.expressions, - org.eclipse.emf.ecore.xmi +Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", + org.eclipse.core.databinding;bundle-version="[1.3.0,2.0.0)", + org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)", + org.eclipse.jface.databinding;bundle-version="[1.4.0,2.0.0)", + org.eclipse.ui.forms;bundle-version="[3.5.0,4.0.0)", + org.eclipse.emf.databinding;bundle-version="[1.4.0,2.0.0)", + org.eclipse.emf.databinding.edit;bundle-version="[1.4.0,2.0.0)", + org.eclipse.emf.examples.databinding.project.core;bundle-version="[1.1.0,2.0.0)", + org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)", + org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Import-Package: org.eclipse.emf.examples.databinding.project.core.model.project diff --git a/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/pom.xml b/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/pom.xml new file mode 100644 index 000000000..ab51e1ed6 --- /dev/null +++ b/examples/org.eclipse.emf.examples.databinding.project.ui.rcp/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.plugins</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.emf.parent/plugins</relativePath> + </parent> + + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.examples.databinding.project.ui.rcp</artifactId> + <version>1.3.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +</project> diff --git a/examples/org.eclipse.emf.examples.generator.validator/.project b/examples/org.eclipse.emf.examples.generator.validator/.project index 850a8507a..87b40bc9b 100644 --- a/examples/org.eclipse.emf.examples.generator.validator/.project +++ b/examples/org.eclipse.emf.examples.generator.validator/.project @@ -26,34 +26,34 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.oomph.version.VersionBuilder</name> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> - <key>ignore.missing.dependency.ranges</key> - <value>true</value> + <key>LaunchConfigHandle</key> + <value><project>/.externalToolBuilders/org.eclipse.emf.examples.generator.validator.launch</value> </dictionary> <dictionary> - <key>ignore.schema.builder</key> + <key>incclean</key> <value>true</value> </dictionary> - <dictionary> - <key>release.path</key> - <value>/org.eclipse.emf.java/release.xml</value> - </dictionary> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>auto,full,incremental,</triggers> + <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/org.eclipse.emf.examples.generator.validator.launch</value> + <key>check.maven.pom</key> + <value>true</value> </dictionary> <dictionary> - <key>incclean</key> + <key>ignore.schema.builder</key> <value>true</value> </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.emf.java/release.xml</value> + </dictionary> </arguments> </buildCommand> </buildSpec> diff --git a/examples/org.eclipse.emf.examples.generator.validator/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.generator.validator/META-INF/MANIFEST.MF index 474809557..cc5e24053 100644 --- a/examples/org.eclipse.emf.examples.generator.validator/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.emf.examples.generator.validator/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.examples.generator.validator;singleton:=true -Bundle-Version: 1.3.0.qualifier +Bundle-Version: 1.4.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.examples.generator.validator.ValidatorGeneratorPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.eclipse.emf.codegen.ecore +Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)", + org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", + org.eclipse.emf.codegen.ecore;bundle-version="[2.14.0,3.0.0)" Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy Export-Package: org.eclipse.emf.examples.generator.validator, diff --git a/examples/org.eclipse.emf.examples.generator.validator/pom.xml b/examples/org.eclipse.emf.examples.generator.validator/pom.xml new file mode 100644 index 000000000..423e3285e --- /dev/null +++ b/examples/org.eclipse.emf.examples.generator.validator/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.plugins</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.emf.parent/plugins</relativePath> + </parent> + + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.examples.generator.validator</artifactId> + <version>1.4.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +</project> diff --git a/examples/org.eclipse.emf.examples.library.edit/.project b/examples/org.eclipse.emf.examples.library.edit/.project index ef89efe10..175466dbb 100644 --- a/examples/org.eclipse.emf.examples.library.edit/.project +++ b/examples/org.eclipse.emf.examples.library.edit/.project @@ -21,34 +21,34 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.oomph.version.VersionBuilder</name> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> - <key>ignore.missing.dependency.ranges</key> - <value>true</value> + <key>LaunchConfigHandle</key> + <value><project>/.externalToolBuilders/org.eclipse.emf.examples.library.edit.launch</value> </dictionary> <dictionary> - <key>ignore.schema.builder</key> + <key>incclean</key> <value>true</value> </dictionary> - <dictionary> - <key>release.path</key> - <value>/org.eclipse.emf.java/release.xml</value> - </dictionary> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>auto,full,incremental,</triggers> + <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/org.eclipse.emf.examples.library.edit.launch</value> + <key>check.maven.pom</key> + <value>true</value> </dictionary> <dictionary> - <key>incclean</key> + <key>ignore.schema.builder</key> <value>true</value> </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.emf.java/release.xml</value> + </dictionary> </arguments> </buildCommand> </buildSpec> diff --git a/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF index 33751c0db..6e0cfb7fb 100644 --- a/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.emf.examples.library.edit/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.examples.library.edit;singleton:=true -Bundle-Version: 2.6.0.qualifier +Bundle-Version: 2.7.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.examples.extlibrary.provider.EXTLibraryEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.emf.examples.extlibrary.provider -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.examples.library;visibility:=reexport, - org.eclipse.emf.edit;visibility:=reexport +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", + org.eclipse.emf.examples.library;bundle-version="[2.7.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit;bundle-version="[2.13.0,3.0.0)";visibility:=reexport Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy diff --git a/examples/org.eclipse.emf.examples.library.edit/pom.xml b/examples/org.eclipse.emf.examples.library.edit/pom.xml new file mode 100644 index 000000000..daff051e2 --- /dev/null +++ b/examples/org.eclipse.emf.examples.library.edit/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.plugins</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.emf.parent/plugins</relativePath> + </parent> + + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.examples.library.edit</artifactId> + <version>2.7.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +</project> diff --git a/examples/org.eclipse.emf.examples.library.editor/.project b/examples/org.eclipse.emf.examples.library.editor/.project index 55d16f5a0..836a5b537 100644 --- a/examples/org.eclipse.emf.examples.library.editor/.project +++ b/examples/org.eclipse.emf.examples.library.editor/.project @@ -21,34 +21,34 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.oomph.version.VersionBuilder</name> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> - <key>ignore.missing.dependency.ranges</key> - <value>true</value> + <key>LaunchConfigHandle</key> + <value><project>/.externalToolBuilders/org.eclipse.emf.examples.library.editor.launch</value> </dictionary> <dictionary> - <key>ignore.schema.builder</key> + <key>incclean</key> <value>true</value> </dictionary> - <dictionary> - <key>release.path</key> - <value>/org.eclipse.emf.java/release.xml</value> - </dictionary> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>auto,full,incremental,</triggers> + <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/org.eclipse.emf.examples.library.editor.launch</value> + <key>check.maven.pom</key> + <value>true</value> </dictionary> <dictionary> - <key>incclean</key> + <key>ignore.schema.builder</key> <value>true</value> </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.emf.java/release.xml</value> + </dictionary> </arguments> </buildCommand> </buildSpec> diff --git a/examples/org.eclipse.emf.examples.library.editor/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.library.editor/META-INF/MANIFEST.MF index e1b9cf593..73bf249fb 100644 --- a/examples/org.eclipse.emf.examples.library.editor/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.emf.examples.library.editor/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.examples.library.editor;singleton:=true -Bundle-Version: 2.6.0.qualifier +Bundle-Version: 2.7.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.examples.extlibrary.presentation.EXTLibraryEditorPlugin$Implementation Bundle-Vendor: %providerName @@ -11,11 +11,11 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.emf.examples.extlibrary.presentation, org.eclipse.emf.examples.extlibrary.presentation, org.eclipse.emf.examples.extlibrary.actions -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.core.resources;visibility:=reexport, - org.eclipse.emf.examples.library.edit;visibility:=reexport, - org.eclipse.emf.ecore.xmi;visibility:=reexport, - org.eclipse.emf.edit.ui;visibility:=reexport, - org.eclipse.ui.ide;visibility:=reexport +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.examples.library.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit.ui;bundle-version="[2.14.0,3.0.0)";visibility:=reexport, + org.eclipse.ui.ide;bundle-version="[3.6.0,4.0.0)";visibility:=reexport Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy diff --git a/examples/org.eclipse.emf.examples.library.editor/pom.xml b/examples/org.eclipse.emf.examples.library.editor/pom.xml new file mode 100644 index 000000000..495b63d69 --- /dev/null +++ b/examples/org.eclipse.emf.examples.library.editor/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.plugins</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.emf.parent/plugins</relativePath> + </parent> + + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.examples.library.editor</artifactId> + <version>2.7.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +</project> diff --git a/examples/org.eclipse.emf.examples.library/.project b/examples/org.eclipse.emf.examples.library/.project index f0b7f68dc..e58dc6988 100644 --- a/examples/org.eclipse.emf.examples.library/.project +++ b/examples/org.eclipse.emf.examples.library/.project @@ -21,34 +21,34 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.oomph.version.VersionBuilder</name> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> - <key>ignore.missing.dependency.ranges</key> - <value>true</value> + <key>LaunchConfigHandle</key> + <value><project>/.externalToolBuilders/org.eclipse.emf.examples.library.launch</value> </dictionary> <dictionary> - <key>ignore.schema.builder</key> + <key>incclean</key> <value>true</value> </dictionary> - <dictionary> - <key>release.path</key> - <value>/org.eclipse.emf.java/release.xml</value> - </dictionary> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>auto,full,incremental,</triggers> + <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/org.eclipse.emf.examples.library.launch</value> + <key>check.maven.pom</key> + <value>true</value> </dictionary> <dictionary> - <key>incclean</key> + <key>ignore.schema.builder</key> <value>true</value> </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.emf.java/release.xml</value> + </dictionary> </arguments> </buildCommand> </buildSpec> diff --git a/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF index decbdf5f4..e052ea324 100644 --- a/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.emf.examples.library/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.examples.library;singleton:=true -Bundle-Version: 2.6.0.qualifier +Bundle-Version: 2.7.0.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -10,8 +10,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.emf.examples.extlibrary, org.eclipse.emf.examples.extlibrary.impl, org.eclipse.emf.examples.extlibrary.util -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.emf.ecore.xmi;visibility:=reexport +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)";visibility:=reexport Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy diff --git a/examples/org.eclipse.emf.examples.library/pom.xml b/examples/org.eclipse.emf.examples.library/pom.xml new file mode 100644 index 000000000..6367a35f1 --- /dev/null +++ b/examples/org.eclipse.emf.examples.library/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.plugins</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.emf.parent/plugins</relativePath> + </parent> + + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.examples.library</artifactId> + <version>2.7.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +</project> diff --git a/examples/org.eclipse.emf.examples/.project b/examples/org.eclipse.emf.examples/.project index 6e8d4b411..e261377d7 100644 --- a/examples/org.eclipse.emf.examples/.project +++ b/examples/org.eclipse.emf.examples/.project @@ -19,6 +19,10 @@ <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> <dictionary> + <key>check.maven.pom</key> + <value>true</value> + </dictionary> + <dictionary> <key>ignore.schema.builder</key> <value>true</value> </dictionary> diff --git a/examples/org.eclipse.emf.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.examples/META-INF/MANIFEST.MF index 24c1c60b1..d83d42c95 100644 --- a/examples/org.eclipse.emf.examples/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.emf.examples/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.examples;singleton:=true -Bundle-Version: 2.6.0.qualifier +Bundle-Version: 2.7.0.qualifier Bundle-Vendor: %providerName Bundle-Localization: plugin Eclipse-LazyStart: true diff --git a/examples/org.eclipse.emf.examples/about.mappings b/examples/org.eclipse.emf.examples/about.mappings index a28390a75..f9d94ab26 100644 --- a/examples/org.eclipse.emf.examples/about.mappings +++ b/examples/org.eclipse.emf.examples/about.mappings @@ -1,6 +1,5 @@ # about.mappings # contains fill-ins for about.properties -# java.io.Properties file (ISO 8859-1 with "\" escapes) -# This file does not need to be translated. -0=@build@ +0=${build.id} +1=${emf.commit.id} diff --git a/examples/org.eclipse.emf.examples/about.properties b/examples/org.eclipse.emf.examples/about.properties index 75bf07180..ad331021d 100644 --- a/examples/org.eclipse.emf.examples/about.properties +++ b/examples/org.eclipse.emf.examples/about.properties @@ -17,7 +17,7 @@ featureText=EMF Examples\n\ Version: {featureVersion}\n\ Build id: {0}\n\ \n\ -(c) Copyright Eclipse contributors and others. 2002, 2010. All rights reserved.\n\ +(c) Copyright Eclipse contributors and others. 2002, 2018. All rights reserved.\n\ \n\ EMF is a Java/XML framework for generating tools and other\n\ applications based on simple class models.\n\ diff --git a/examples/org.eclipse.emf.examples/pom.xml b/examples/org.eclipse.emf.examples/pom.xml new file mode 100644 index 000000000..29301a6e8 --- /dev/null +++ b/examples/org.eclipse.emf.examples/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.plugins</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.emf.parent/plugins</relativePath> + </parent> + + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.examples</artifactId> + <version>2.7.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +</project> diff --git a/examples/org.eclipse.emf.exporter.html/.project b/examples/org.eclipse.emf.exporter.html/.project index d3b64c47c..9430508a6 100644 --- a/examples/org.eclipse.emf.exporter.html/.project +++ b/examples/org.eclipse.emf.exporter.html/.project @@ -26,34 +26,34 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.oomph.version.VersionBuilder</name> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> - <key>ignore.missing.dependency.ranges</key> - <value>true</value> + <key>LaunchConfigHandle</key> + <value><project>/.externalToolBuilders/org.eclipse.emf.exporter.html.launch</value> </dictionary> <dictionary> - <key>ignore.schema.builder</key> + <key>incclean</key> <value>true</value> </dictionary> - <dictionary> - <key>release.path</key> - <value>/org.eclipse.emf.java/release.xml</value> - </dictionary> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>auto,full,incremental,</triggers> + <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/org.eclipse.emf.exporter.html.launch</value> + <key>check.maven.pom</key> + <value>true</value> </dictionary> <dictionary> - <key>incclean</key> + <key>ignore.schema.builder</key> <value>true</value> </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.emf.java/release.xml</value> + </dictionary> </arguments> </buildCommand> </buildSpec> diff --git a/examples/org.eclipse.emf.exporter.html/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.exporter.html/META-INF/MANIFEST.MF index 1cae2815e..21b5ae649 100644 --- a/examples/org.eclipse.emf.exporter.html/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.emf.exporter.html/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.exporter.html;singleton:=true -Bundle-Version: 2.6.0.qualifier +Bundle-Version: 2.7.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.exporter.html.HTMLExporterPlugin$Implementation Bundle-Vendor: %providerName @@ -10,10 +10,10 @@ Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.emf.exporter.html, org.eclipse.emf.exporter.html.ui -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.exporter, - org.eclipse.emf.codegen.ecore.ui;resolution:=optional, - org.eclipse.core.resources;resolution:=optional +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", + org.eclipse.emf.exporter;bundle-version="[2.8.0,3.0.0)", + org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.14.0,3.0.0)";resolution:=optional, + org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)";resolution:=optional Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy diff --git a/examples/org.eclipse.emf.exporter.html/pom.xml b/examples/org.eclipse.emf.exporter.html/pom.xml new file mode 100644 index 000000000..dac3551bf --- /dev/null +++ b/examples/org.eclipse.emf.exporter.html/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.plugins</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.emf.parent/plugins</relativePath> + </parent> + + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.exporter.html</artifactId> + <version>2.7.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +</project> diff --git a/examples/org.eclipse.emf.java.edit/.project b/examples/org.eclipse.emf.java.edit/.project index c4d75130f..d0d387364 100644 --- a/examples/org.eclipse.emf.java.edit/.project +++ b/examples/org.eclipse.emf.java.edit/.project @@ -21,34 +21,34 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.oomph.version.VersionBuilder</name> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> - <key>ignore.missing.dependency.ranges</key> - <value>true</value> + <key>LaunchConfigHandle</key> + <value><project>/.externalToolBuilders/org.eclipse.emf.java.edit.launch</value> </dictionary> <dictionary> - <key>ignore.schema.builder</key> + <key>incclean</key> <value>true</value> </dictionary> - <dictionary> - <key>release.path</key> - <value>/org.eclipse.emf.java/release.xml</value> - </dictionary> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>auto,full,incremental,</triggers> + <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/org.eclipse.emf.java.edit.launch</value> + <key>check.maven.pom</key> + <value>true</value> </dictionary> <dictionary> - <key>incclean</key> + <key>ignore.schema.builder</key> <value>true</value> </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.emf.java/release.xml</value> + </dictionary> </arguments> </buildCommand> </buildSpec> diff --git a/examples/org.eclipse.emf.java.edit/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.java.edit/META-INF/MANIFEST.MF index 0720db77a..df4497145 100644 --- a/examples/org.eclipse.emf.java.edit/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.emf.java.edit/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.java.edit;singleton:=true -Bundle-Version: 2.6.0.qualifier +Bundle-Version: 2.7.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.java.provider.JavaEditPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.emf.java.provider -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.edit;visibility:=reexport, - org.eclipse.emf.java;visibility:=reexport +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", + org.eclipse.emf.edit;bundle-version="[2.13.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.java;bundle-version="[2.7.0,3.0.0)";visibility:=reexport Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy diff --git a/examples/org.eclipse.emf.java.edit/pom.xml b/examples/org.eclipse.emf.java.edit/pom.xml new file mode 100644 index 000000000..57a9e3363 --- /dev/null +++ b/examples/org.eclipse.emf.java.edit/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.plugins</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.emf.parent/plugins</relativePath> + </parent> + + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.java.edit</artifactId> + <version>2.7.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +</project> diff --git a/examples/org.eclipse.emf.java.editor/.project b/examples/org.eclipse.emf.java.editor/.project index 9c90eed44..a42e38f89 100644 --- a/examples/org.eclipse.emf.java.editor/.project +++ b/examples/org.eclipse.emf.java.editor/.project @@ -21,34 +21,34 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.oomph.version.VersionBuilder</name> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> - <key>ignore.missing.dependency.ranges</key> - <value>true</value> + <key>LaunchConfigHandle</key> + <value><project>/.externalToolBuilders/org.eclipse.emf.java.editor.launch</value> </dictionary> <dictionary> - <key>ignore.schema.builder</key> + <key>incclean</key> <value>true</value> </dictionary> - <dictionary> - <key>release.path</key> - <value>/org.eclipse.emf.java/release.xml</value> - </dictionary> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>auto,full,incremental,</triggers> + <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/org.eclipse.emf.java.editor.launch</value> + <key>check.maven.pom</key> + <value>true</value> </dictionary> <dictionary> - <key>incclean</key> + <key>ignore.schema.builder</key> <value>true</value> </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.emf.java/release.xml</value> + </dictionary> </arguments> </buildCommand> </buildSpec> diff --git a/examples/org.eclipse.emf.java.editor/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.java.editor/META-INF/MANIFEST.MF index c704f4937..4c2346811 100644 --- a/examples/org.eclipse.emf.java.editor/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.emf.java.editor/META-INF/MANIFEST.MF @@ -2,18 +2,18 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.java.editor; singleton:=true -Bundle-Version: 2.6.0.qualifier +Bundle-Version: 2.7.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.java.presentation.JavaEditorPlugin$Implementation Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.emf.java.presentation -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.ui.ide, - org.eclipse.emf.java.edit;visibility:=reexport, - org.eclipse.emf.edit.ui;visibility:=reexport, - org.eclipse.emf.ecore.xmi;visibility:=reexport +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", + org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)", + org.eclipse.ui.ide;bundle-version="[3.6.0,4.0.0)", + org.eclipse.emf.java.edit;bundle-version="[2.7.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.edit.ui;bundle-version="[2.14.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)";visibility:=reexport Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy diff --git a/examples/org.eclipse.emf.java.editor/pom.xml b/examples/org.eclipse.emf.java.editor/pom.xml new file mode 100644 index 000000000..2eeba2142 --- /dev/null +++ b/examples/org.eclipse.emf.java.editor/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.plugins</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.emf.parent/plugins</relativePath> + </parent> + + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.java.editor</artifactId> + <version>2.7.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +</project> diff --git a/examples/org.eclipse.emf.java/.project b/examples/org.eclipse.emf.java/.project index 6d55901ae..cfbd90132 100644 --- a/examples/org.eclipse.emf.java/.project +++ b/examples/org.eclipse.emf.java/.project @@ -21,34 +21,34 @@ </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.oomph.version.VersionBuilder</name> + <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> + <triggers>auto,full,incremental,</triggers> <arguments> <dictionary> - <key>ignore.missing.dependency.ranges</key> - <value>true</value> + <key>LaunchConfigHandle</key> + <value><project>/.externalToolBuilders/org.eclipse.emf.java.launch</value> </dictionary> <dictionary> - <key>ignore.schema.builder</key> + <key>incclean</key> <value>true</value> </dictionary> - <dictionary> - <key>release.path</key> - <value>/org.eclipse.emf.java/release.xml</value> - </dictionary> </arguments> </buildCommand> <buildCommand> - <name>org.eclipse.ui.externaltools.ExternalToolBuilder</name> - <triggers>auto,full,incremental,</triggers> + <name>org.eclipse.oomph.version.VersionBuilder</name> <arguments> <dictionary> - <key>LaunchConfigHandle</key> - <value><project>/.externalToolBuilders/org.eclipse.emf.java.launch</value> + <key>check.maven.pom</key> + <value>true</value> </dictionary> <dictionary> - <key>incclean</key> + <key>ignore.schema.builder</key> <value>true</value> </dictionary> + <dictionary> + <key>release.path</key> + <value>/org.eclipse.emf.java/release.xml</value> + </dictionary> </arguments> </buildCommand> </buildSpec> diff --git a/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF index 271580ed4..0a3382bbd 100644 --- a/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF +++ b/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.java;singleton:=true -Bundle-Version: 2.6.0.qualifier +Bundle-Version: 2.7.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.java.JavaPlugin$Implementation Bundle-Vendor: %providerName @@ -11,9 +11,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.eclipse.emf.java, org.eclipse.emf.java.impl, org.eclipse.emf.java.util -Require-Bundle: org.eclipse.core.runtime, - org.eclipse.emf.ecore;visibility:=reexport, - org.eclipse.jdt.core;visibility:=reexport, - org.eclipse.emf.codegen +Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", + org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)";visibility:=reexport, + org.eclipse.jdt.core;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, + org.eclipse.emf.codegen;bundle-version="[2.13.0,3.0.0)" Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy diff --git a/examples/org.eclipse.emf.java/pom.xml b/examples/org.eclipse.emf.java/pom.xml new file mode 100644 index 000000000..890753d8c --- /dev/null +++ b/examples/org.eclipse.emf.java/pom.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.plugins</artifactId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../releng/org.eclipse.emf.parent/plugins</relativePath> + </parent> + + <groupId>org.eclipse.emf</groupId> + <artifactId>org.eclipse.emf.java</artifactId> + <version>2.7.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> + +</project> diff --git a/examples/org.eclipse.emf.java/release.digest b/examples/org.eclipse.emf.java/release.digest Binary files differindex 123de8e14..e40bd074b 100644 --- a/examples/org.eclipse.emf.java/release.digest +++ b/examples/org.eclipse.emf.java/release.digest diff --git a/examples/org.eclipse.emf.java/release.xml b/examples/org.eclipse.emf.java/release.xml index db5d9f899..2a62a9190 100644 --- a/examples/org.eclipse.emf.java/release.xml +++ b/examples/org.eclipse.emf.java/release.xml @@ -2,7 +2,6 @@ <release> <feature name="org.eclipse.emf.examples" version="2.12.0"> <feature name="org.eclipse.emf.license" version="2.8.0" license="true"/> - <feature name="org.eclipse.emf.examples.source" version="0.0.0"/> <!-- UNRESOLVED --> <plugin name="org.eclipse.emf.examples" version="2.6.0"/> <plugin name="org.eclipse.emf.java" version="2.6.0"/> <plugin name="org.eclipse.emf.java.edit" version="2.6.0"/> @@ -18,7 +17,6 @@ <plugin name="org.eclipse.emf.examples.databinding.project.core.model" version="1.1.0"/> <plugin name="org.eclipse.emf.examples.databinding.project.ui.rcp" version="1.2.0"/> </feature> - <feature name="org.eclipse.emf.examples.source" version="0.0.0"/> <!-- UNRESOLVED --> <feature name="org.eclipse.emf.license" version="2.8.0"/> <plugin name="org.eclipse.emf.activities" version="2.6.0"/> <plugin name="org.eclipse.emf.examples" version="2.6.0"/> |