Add feature license version checking

2 files changed, 9 insertions, 2 deletions

diff --git a/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/internal/version/ReleaseManager.java b/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/internal/version/ReleaseManager.java
index 8733e133ec..a4d726bddc 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/internal/version/ReleaseManager.java
+++ b/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/internal/version/ReleaseManager.java
@@ -186,6 +186,13 @@ public class ReleaseManager implements IReleaseManager
 
     if (withContent)
     {
+      String licenseFeatureID = feature.getLicenseFeatureID();
+      if (licenseFeatureID.length() != 0)
+      {
+        IElement child = new Element(IElement.Type.FEATURE, licenseFeatureID, feature.getLicenseFeatureVersion());
+        element.getChildren().add(child);
+      }
+
       for (org.eclipse.pde.internal.core.ifeature.IFeatureChild versionable : feature.getIncludedFeatures())
       {
         IElement child = new Element(IElement.Type.FEATURE, versionable.getId(), versionable.getVersion());
diff --git a/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/internal/version/VersionBuilder.java b/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/internal/version/VersionBuilder.java
index 3f931c4a33..388dc0573f 100644
--- a/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/internal/version/VersionBuilder.java
+++ b/plugins/org.eclipse.emf.cdo.releng.version/src/org/eclipse/emf/cdo/releng/internal/version/VersionBuilder.java
@@ -372,7 +372,7 @@ public class VersionBuilder extends IncrementalProjectBuilder implements IElemen
         if (!arguments.isIgnoreFeatureContentChanges())
         {
           List<Map.Entry<IElement, Version>> warnings = new ArrayList<Entry<IElement, Version>>();
-          int change = checkFeatureContentChanges(componentModel, element, releaseElement, warnings);
+          int change = checkFeatureContentChanges(element, releaseElement, warnings);
           if (change != NO_CHANGE)
           {
             Version nextFeatureVersion = getNextFeatureVersion(releaseVersion, nextMicroVersion, change);
@@ -572,7 +572,7 @@ public class VersionBuilder extends IncrementalProjectBuilder implements IElemen
     return nextFeatureVersion;
   }
 
-  private int checkFeatureContentChanges(IModel componentModel, IElement element, IElement releasedElement,
+  private int checkFeatureContentChanges(IElement element, IElement releasedElement,
       List<Entry<IElement, Version>> warnings)
   {
     int biggestChange = NO_CHANGE;