Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2015-07-02 10:11:03 -0400
committerOlivier Constant2015-07-02 10:11:03 -0400
commit2d804270c3796527ff2505509946d2c1565cbb63 (patch)
treec45851437d6462217a923a09b53c60841f5f8eeb
parent791a743dc9e2811a4d57b53731bd71f302f87db1 (diff)
downloadorg.eclipse.emf.diffmerge.core-0.4.x.tar.gz
org.eclipse.emf.diffmerge.core-0.4.x.tar.xz
org.eclipse.emf.diffmerge.core-0.4.x.zip
Increased feature+core version number to 0.4.2v0.4.20.4.x
Change-Id: Ic700b74d2ecd319f9f737ffc3980d08d8285457d Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/category.xml20
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml104
-rw-r--r--plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF58
3 files changed, 91 insertions, 91 deletions
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/category.xml b/features/org.eclipse.emf.diffmerge.sdk.feature/category.xml
index 3b28fdc9..ad5df89f 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/category.xml
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/category.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.feature_0.4.1.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.4.1.qualifier">
- <category name="org.eclipse.emf.diffmerge.category"/>
- </feature>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.source.feature_0.4.1.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.source.feature" version="0.4.1.qualifier">
- <category name="org.eclipse.emf.diffmerge.category"/>
- </feature>
- <category-def name="org.eclipse.emf.diffmerge.category" label="EMF Diff/Merge (Incubation)"/>
-</site>
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.feature_0.4.2.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.4.2.qualifier">
+ <category name="org.eclipse.emf.diffmerge.category"/>
+ </feature>
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.source.feature_0.4.2.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.source.feature" version="0.4.2.qualifier">
+ <category name="org.eclipse.emf.diffmerge.category"/>
+ </feature>
+ <category-def name="org.eclipse.emf.diffmerge.category" label="EMF Diff/Merge (Incubation)"/>
+</site>
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
index 5168d5bd..8d6bae29 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
@@ -1,56 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.emf.diffmerge.sdk.feature"
- label="EMF Diff/Merge SDK Feature (Incubation)"
- version="0.4.1.qualifier"
- provider-name="Eclipse Modeling Project">
-
- <description>
- A diff/merge tool for models. Its main purpose is to help build higher-level tools that need to merge models based on consistency rules. GUI components are also provided. Typical usages include model refactoring, iterative model transformations, bridges between models or modeling tools, collaborative modeling environments, or versioning systems.
- </description>
-
- <copyright>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emf.diffmerge.sdk.feature"
+ label="EMF Diff/Merge SDK Feature (Incubation)"
+ version="0.4.2.qualifier"
+ provider-name="Eclipse Modeling Project">
+
+ <description>
+ A diff/merge tool for models. Its main purpose is to help build higher-level tools that need to merge models based on consistency rules. GUI components are also provided. Typical usages include model refactoring, iterative model transformations, bridges between models or modeling tools, collaborative modeling environments, or versioning systems.
+ </description>
+
+ <copyright>
Copyright (c) 2010-2014 Thales Global Services S.A.S.
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
-http://www.eclipse.org/legal/epl-v10.html
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <includes
- id="org.eclipse.emf.diffmerge.sdk.source.feature"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.emf.diffmerge"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.diffmerge.gmf"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.diffmerge.ui"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.eclipse.emf.diffmerge.ui.gmf"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+http://www.eclipse.org/legal/epl-v10.html
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <includes
+ id="org.eclipse.emf.diffmerge.sdk.source.feature"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.emf.diffmerge"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.diffmerge.gmf"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.diffmerge.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.emf.diffmerge.ui.gmf"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>
diff --git a/plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF
index c153d1cc..f60e149b 100644
--- a/plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF
@@ -1,29 +1,29 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.emf.diffmerge;singleton:=true
-Bundle-Version: 0.4.1.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.emf.diffmerge.EMFDiffMergePlugin
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.emf.diffmerge,
- org.eclipse.emf.diffmerge.api,
- org.eclipse.emf.diffmerge.api.diff,
- org.eclipse.emf.diffmerge.api.scopes,
- org.eclipse.emf.diffmerge.diffdata,
- org.eclipse.emf.diffmerge.diffdata.impl,
- org.eclipse.emf.diffmerge.diffdata.util,
- org.eclipse.emf.diffmerge.impl.helpers,
- org.eclipse.emf.diffmerge.impl.policies,
- org.eclipse.emf.diffmerge.impl.scopes,
- org.eclipse.emf.diffmerge.util,
- org.eclipse.emf.diffmerge.util.structures,
- org.eclipse.emf.diffmerge.util.structures.comparable
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.emf.diffmerge;singleton:=true
+Bundle-Version: 0.4.2.qualifier
+Bundle-ClassPath: .
+Bundle-Vendor: %providerName
+Bundle-Activator: org.eclipse.emf.diffmerge.EMFDiffMergePlugin
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.emf.diffmerge,
+ org.eclipse.emf.diffmerge.api,
+ org.eclipse.emf.diffmerge.api.diff,
+ org.eclipse.emf.diffmerge.api.scopes,
+ org.eclipse.emf.diffmerge.diffdata,
+ org.eclipse.emf.diffmerge.diffdata.impl,
+ org.eclipse.emf.diffmerge.diffdata.util,
+ org.eclipse.emf.diffmerge.impl.helpers,
+ org.eclipse.emf.diffmerge.impl.policies,
+ org.eclipse.emf.diffmerge.impl.scopes,
+ org.eclipse.emf.diffmerge.util,
+ org.eclipse.emf.diffmerge.util.structures,
+ org.eclipse.emf.diffmerge.util.structures.comparable
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;visibility:=reexport,
+ org.eclipse.emf.ecore.xmi,
+ org.eclipse.emf.edit
+Bundle-ActivationPolicy: lazy
+Eclipse-LazyStart: true

Back to the top