Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZoltan Ujhelyi2017-05-26 09:17:10 +0000
committerZoltan Ujhelyi2017-05-26 09:17:10 +0000
commit97ace658db0d11e2e105ddbc63fb150514e74b50 (patch)
treecb362b1f4ded378d82d93cda8c44a68be3208632 /features
parent7499c382556dff359fb1f76a3ddb47b19d6179a7 (diff)
downloadorg.eclipse.emf.diffmerge.core-97ace658db0d11e2e105ddbc63fb150514e74b50.tar.gz
org.eclipse.emf.diffmerge.core-97ace658db0d11e2e105ddbc63fb150514e74b50.tar.xz
org.eclipse.emf.diffmerge.core-97ace658db0d11e2e105ddbc63fb150514e74b50.zip
[500320] Fixing license settings in features
When the original builds were updated to use the common license-feature provided by CBI, the license property requirements were removed by mistake. The GMF feature includes this required property. Change-Id: I29c3a738f0d5f8d56d2572ba56ceab66c52a2c4c Signed-off-by: Zoltan Ujhelyi <ujhelyiz@incquerylabs.com>
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.emf.diffmerge.egit.feature/feature.xml4
-rw-r--r--features/org.eclipse.emf.diffmerge.feature/feature.xml4
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml6
-rw-r--r--features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml4
-rw-r--r--features/org.eclipse.emf.diffmerge.svn.feature/feature.xml4
-rw-r--r--features/org.eclipse.emf.diffmerge.tests.feature/feature.xml4
6 files changed, 25 insertions, 1 deletions
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
index 9e035366..2cf4f345 100644
--- a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
@@ -15,6 +15,10 @@
%copyright
</copyright>
+ <license url="%licenseURL">
+ %license
+ </license>
+
<requires>
<import feature="org.eclipse.emf.diffmerge.feature"/>
</requires>
diff --git a/features/org.eclipse.emf.diffmerge.feature/feature.xml b/features/org.eclipse.emf.diffmerge.feature/feature.xml
index e0c2df41..a33a44f1 100644
--- a/features/org.eclipse.emf.diffmerge.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.feature/feature.xml
@@ -15,6 +15,10 @@
%copyright
</copyright>
+ <license url="%licenseURL">
+ %license
+ </license>
+
<plugin
id="org.eclipse.emf.diffmerge"
download-size="0"
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
index 27869560..f5736e81 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
@@ -14,7 +14,11 @@
<copyright>
%copyright
</copyright>
-
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
<includes
id="org.eclipse.emf.diffmerge.feature"
version="0.0.0"/>
diff --git a/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
index d273ad40..55f43c16 100644
--- a/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
@@ -29,6 +29,10 @@
%copyright
</copyright>
+ <license url="%licenseURL">
+ %license
+ </license>
+
<requires>
<import feature="org.eclipse.emf.diffmerge.gmf.feature"/>
</requires>
diff --git a/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml b/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
index ec84a2fb..bd9a48c2 100644
--- a/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
@@ -15,6 +15,10 @@
%copyright
</copyright>
+ <license url="%licenseURL">
+ %license
+ </license>
+
<requires>
<import feature="org.eclipse.emf.diffmerge.feature"/>
</requires>
diff --git a/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml b/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml
index 0f9c8911..7bd04c58 100644
--- a/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml
@@ -15,6 +15,10 @@
%copyright
</copyright>
+ <license url="%licenseURL">
+ %license
+ </license>
+
<requires>
<import feature="org.eclipse.emf.diffmerge.feature"/>
</requires>

Back to the top