Bug 567035 implement floating license pack issuing

Fix merge conflicts Signed-off-by: eparovyshnaya <[email protected]>
eclipse-passage · Nov 8, 2020 · af89acf · af89acf
1 parent 17e8f7d
commit af89acf
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/bundles/org.eclipse.passage.lic.api/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.api/META-INF/MANIFEST.MF
@@ -24,7 +24,8 @@ Export-Package: org.eclipse.passage.lic.internal.api;
    org.eclipse.passage.lic.equinox.tests,
    org.eclipse.passage.lic.base.tests,
    org.eclipse.passage.lic.api.tests,
-   org.eclipse.passage.lbc.base.tests",
+   org.eclipse.passage.lbc.base.tests,
+   org.eclipse.passage.loc.licenses.core",
  org.eclipse.passage.lic.internal.api.conditions;
   x-friends:="org.eclipse.passage.lbc.api,
    org.eclipse.passage.lbc.base,

diff --git a/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.base/META-INF/MANIFEST.MF
@@ -13,7 +13,8 @@ Export-Package: org.eclipse.passage.lic.internal.base;
    org.eclipse.passage.lic.equinox,
    org.eclipse.passage.lic.hc,
    org.eclipse.passage.lic.jface,
-   org.eclipse.passage.lic.base.tests",
+   org.eclipse.passage.lic.base.tests,
+   org.eclipse.passage.loc.licenses.core",
  org.eclipse.passage.lic.internal.base.access;x-internal:=true,
  org.eclipse.passage.lic.internal.base.conditions;
   x-friends:="org.eclipse.passage.lbc.base,
@@ -30,7 +31,11 @@ Export-Package: org.eclipse.passage.lic.internal.base;
  org.eclipse.passage.lic.internal.base.i18n;x-internal:=true,
  org.eclipse.passage.lic.internal.base.inspection;x-friends:="org.eclipse.passage.loc.licenses.core",
  org.eclipse.passage.lic.internal.base.inspection.hardware;x-friends:="org.eclipse.passage.loc.licenses.core",
- org.eclipse.passage.lic.internal.base.io;x-friends:="org.eclipse.passage.lic.equinox,org.eclipse.passage.lbc.base",
+ org.eclipse.passage.lic.internal.base.io;
+  x-friends:="org.eclipse.passage.lic.equinox,
+   org.eclipse.passage.lbc.base,
+   org.eclipse.passage.loc.licenses.core,
+   org.eclipse.passage.lic.floating",
  org.eclipse.passage.lic.internal.base.observatory;x-internal:=true,
  org.eclipse.passage.lic.internal.base.registry;x-friends:="org.eclipse.passage.lbc.base",
  org.eclipse.passage.lic.internal.base.requirements;x-internal:=true,

diff --git a/bundles/org.eclipse.passage.lic.emf/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.emf/META-INF/MANIFEST.MF
@@ -13,6 +13,8 @@ Require-Bundle: org.eclipse.osgi;bundle-version="0.0.0",
 Export-Package: org.eclipse.passage.lic.emf.ecore;x-friends:="org.eclipse.passage.loc.dashboard.ui,org.eclipse.passage.loc.workbench.emfforms",
  org.eclipse.passage.lic.emf.ecore.util;
   x-friends:="org.eclipse.passage.lic.features.migration,
+   org.eclipse.passage.lic.emf.edit;x-internal:=true,
+   org.eclipse.passage.lic.internal.emf.i18n;x-internal:=true,
    org.eclipse.passage.lic.features.migration.tests,
    org.eclipse.passage.lic.licenses.migration,
    org.eclipse.passage.lic.licenses.migration.tests,

diff --git a/bundles/org.eclipse.passage.lic.floating/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.lic.floating/META-INF/MANIFEST.MF
@@ -7,3 +7,5 @@ Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Copyright: %Bundle-Copyright
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Export-Package: org.eclipse.passage.lic.floating;x-friends:="org.eclipse.passage.loc.licenses.core"
+Require-Bundle: org.eclipse.passage.lic.base;bundle-version="1.0.1"
diff --git a/bundles/org.eclipse.passage.loc.api/META-INF/MANIFEST.MF b/bundles/org.eclipse.passage.loc.api/META-INF/MANIFEST.MF
@@ -23,7 +23,8 @@ Export-Package: org.eclipse.passage.loc.internal.api;
    org.eclipse.passage.loc.licenses.core,
    org.eclipse.passage.loc.users.core,
    org.eclipse.passage.loc.workbench,
-   org.eclipse.passage.loc.dashboard.ui"
+   org.eclipse.passage.loc.dashboard.ui",
+ org.eclipse.passage.loc.internal.emf;x-friends:="org.eclipse.passage.loc.licenses.core"
 Require-Bundle: org.eclipse.e4.core.services;bundle-version="0.0.0",
  org.eclipse.emf.edit;bundle-version="2.16.0",
  org.eclipse.equinox.common;bundle-version="0.0.0";visibility:=reexport,