Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2016-05-23 14:50:38 +0000
committerOlivier Constant2016-05-23 14:50:38 +0000
commitc775839252b03409128c6b33a941753072b86ece (patch)
treed7151830884558d6d659f9328628fd611fcca9a4 /features
parentdfdb9a881ed2cb83acc73ebeb10ddb4804dd6141 (diff)
downloadorg.eclipse.emf.diffmerge.core-c775839252b03409128c6b33a941753072b86ece.tar.gz
org.eclipse.emf.diffmerge.core-c775839252b03409128c6b33a941753072b86ece.tar.xz
org.eclipse.emf.diffmerge.core-c775839252b03409128c6b33a941753072b86ece.zip
Build support for SCMs (attempt 2)v0.6.0
Change-Id: I7ef640466d3fc966ca4791b3ad53826c7e3aca72 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.emf.diffmerge.scm.feature/category.xml50
-rw-r--r--features/org.eclipse.emf.diffmerge.scm.feature/feature.xml68
2 files changed, 54 insertions, 64 deletions
diff --git a/features/org.eclipse.emf.diffmerge.scm.feature/category.xml b/features/org.eclipse.emf.diffmerge.scm.feature/category.xml
index 304b28b4..108135b6 100644
--- a/features/org.eclipse.emf.diffmerge.scm.feature/category.xml
+++ b/features/org.eclipse.emf.diffmerge.scm.feature/category.xml
@@ -1,28 +1,22 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.6.0.qualifier">
- <category name="org.eclipse.emf.diffmerge.scm.category"/>
- </feature>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.source.feature" version="0.6.0.qualifier">
- <category name="org.eclipse.emf.diffmerge.scm.category"/>
- </feature>
- <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.6.0.qualifier">
- <category name="org.eclipse.emf.diffmerge.scm.category"/>
- </feature>
- <feature url="features/org.eclipse.emf.diffmerge.egit.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.source.feature" version="0.6.0.qualifier">
- <category name="org.eclipse.emf.diffmerge.scm.category"/>
- </feature>
- <feature url="features/org.eclipse.emf.diffmerge.svn.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.feature" version="0.6.0.qualifier">
- <category name="org.eclipse.emf.diffmerge.scm.category"/>
- </feature>
- <feature url="features/org.eclipse.emf.diffmerge.svn.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.source.feature" version="0.6.0.qualifier">
- <category name="org.eclipse.emf.diffmerge.scm.category"/>
- </feature>
- <feature url="features/org.eclipse.emf.diffmerge.perforce.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.perforce.feature" version="0.6.0.qualifier">
- <category name="org.eclipse.emf.diffmerge.scm.category"/>
- </feature>
- <feature url="features/org.eclipse.emf.diffmerge.perforce.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.perforce.source.feature" version="0.6.0.qualifier">
- <category name="org.eclipse.emf.diffmerge.scm.category"/>
- </feature>
- <category-def name="org.eclipse.emf.diffmerge.scm.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.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.6.0.qualifier">
+ <category name="org.eclipse.emf.diffmerge.scm.category"/>
+ </feature>
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.source.feature" version="0.6.0.qualifier">
+ <category name="org.eclipse.emf.diffmerge.scm.category"/>
+ </feature>
+ <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.6.0.qualifier">
+ <category name="org.eclipse.emf.diffmerge.scm.category"/>
+ </feature>
+ <feature url="features/org.eclipse.emf.diffmerge.egit.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.source.feature" version="0.6.0.qualifier">
+ <category name="org.eclipse.emf.diffmerge.scm.category"/>
+ </feature>
+ <feature url="features/org.eclipse.emf.diffmerge.svn.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.feature" version="0.6.0.qualifier">
+ <category name="org.eclipse.emf.diffmerge.scm.category"/>
+ </feature>
+ <feature url="features/org.eclipse.emf.diffmerge.svn.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.source.feature" version="0.6.0.qualifier">
+ <category name="org.eclipse.emf.diffmerge.scm.category"/>
+ </feature>
+ <category-def name="org.eclipse.emf.diffmerge.scm.category" label="EMF Diff/Merge (Incubation)"/>
+</site>
diff --git a/features/org.eclipse.emf.diffmerge.scm.feature/feature.xml b/features/org.eclipse.emf.diffmerge.scm.feature/feature.xml
index 3f87c414..68ba7a22 100644
--- a/features/org.eclipse.emf.diffmerge.scm.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.scm.feature/feature.xml
@@ -1,40 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.emf.diffmerge.scm.feature"
- label="EMF Diff/Merge SCM Integration Feature (Incubation)"
- version="0.6.0.qualifier"
- provider-name="Eclipse Modeling Project">
-
- <description>
- An integration of EMF Diff/Merge with various Eclipse SCM clients.
- </description>
-
- <copyright>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emf.diffmerge.scm.feature"
+ label="EMF Diff/Merge SCM Integration Feature (Incubation)"
+ version="0.6.0.qualifier"
+ provider-name="Eclipse Modeling Project">
+
+ <description>
+ An integration of EMF Diff/Merge with various Eclipse SCM clients.
+ </description>
+
+ <copyright>
Copyright (c) 2016 Thales Global Services S.A.S. 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
-http://www.eclipse.org/legal/epl-v10.html
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <includes
- id="org.eclipse.emf.diffmerge.egit.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.diffmerge.svn.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.diffmerge.perforce.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.diffmerge.sdk.feature"
- version="0.0.0"/>
-
-</feature>
+http://www.eclipse.org/legal/epl-v10.html
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <includes
+ id="org.eclipse.emf.diffmerge.egit.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.diffmerge.svn.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.diffmerge.sdk.feature"
+ version="0.0.0"/>
+
+</feature>

Back to the top