Skip to content

Commit

Permalink
Bug 572650 upgrade licenses domain model
Browse files Browse the repository at this point in the history
Ignore precise versions in passage-internal dependencies

Signed-off-by: eparovyshnaya <[email protected]>
  • Loading branch information
eparovyshnaya committed Apr 14, 2021
1 parent f078018 commit d2b56b3
Show file tree
Hide file tree
Showing 17 changed files with 75 additions and 53 deletions.
6 changes: 3 additions & 3 deletions bundles/org.eclipse.passage.lbc.base/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ Require-Bundle: org.eclipse.osgi;bundle-version="0.0.0",
org.eclipse.passage.lic.net;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0",
org.eclipse.emf.ecore.xmi;bundle-version="0.0.0",
org.eclipse.passage.lic.emf;bundle-version="1.0.100",
org.eclipse.passage.lic.oshi;bundle-version="1.0.1",
org.eclipse.passage.lic.emf;bundle-version="0.0.0",
org.eclipse.passage.lic.oshi;bundle-version="0.0.0",
org.apache.logging.log4j;bundle-version="2.8.2",
org.eclipse.passage.lic.equinox;bundle-version="1.0.201"
org.eclipse.passage.lic.equinox;bundle-version="0.0.0"
Export-Package: org.eclipse.passage.lbc.internal.base;x-friends:="org.eclipse.passage.lbc.jetty,org.eclipse.passage.lbc.base.tests,org.eclipse.passage.lic.hc.tests",
org.eclipse.passage.lbc.internal.base.acquire;x-friends:="org.eclipse.passage.lbc.base.tests,org.eclipse.passage.lic.hc.tests",
org.eclipse.passage.lbc.internal.base.api;x-internal:=true,
Expand Down
10 changes: 5 additions & 5 deletions bundles/org.eclipse.passage.lic.hc/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ Require-Bundle: org.apache.httpcomponents.httpcore;bundle-version="0.0.0",
org.eclipse.emf.ecore.xmi;bundle-version="0.0.0",
org.eclipse.osgi;bundle-version="0.0.0",
org.eclipse.osgi.services;bundle-version="0.0.0",
org.eclipse.passage.lic.api;bundle-version="1.0.201",
org.eclipse.passage.lic.base;bundle-version="1.0.0",
org.eclipse.passage.lic.emf;bundle-version="1.0.100",
org.eclipse.passage.lic.equinox;bundle-version="1.0.0",
org.eclipse.passage.lic.api;bundle-version="0.0.0",
org.eclipse.passage.lic.base;bundle-version="0.0.0",
org.eclipse.passage.lic.emf;bundle-version="0.0.0",
org.eclipse.passage.lic.equinox;bundle-version="0.0.0",
org.eclipse.passage.lic.net;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="1.1.0"
org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0"
Export-Package: org.eclipse.passage.lic.internal.hc.remote;x-internal:=true,
org.eclipse.passage.lic.internal.hc.remote.impl;x-internal:=true,
org.eclipse.passage.lic.internal.hc.remote.impl.acquire;x-internal:=true,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.passage.lic.licenses.edit" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter id="929038356">
<filter id="927989779">
<message_arguments>
<message_argument value="1.0.201"/>
<message_argument value="org.eclipse.passage.lic.licenses.model"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Bundle-Copyright: %Bundle-Copyright
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";x-installation:=greedy;resolution:=optional,
org.eclipse.passage.lic.licenses.model;bundle-version="1.1.0";visibility:=reexport,
org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.emf.edit;bundle-version="0.0.0";visibility:=reexport
Import-Package: org.osgi.framework
Export-Package: org.eclipse.passage.lic.licenses.edit;x-internal:=true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ Bundle-Vendor: %providerName
Bundle-Copyright: %Bundle-Copyright
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";x-installation:=greedy;resolution:=optional,
Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0";resolution:=optional;x-installation:=greedy,
org.eclipse.emf.ecore;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.lic.emf.meta;bundle-version="0.6.0",
org.eclipse.passage.lic.emf.meta;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.lic.base;bundle-version="1.0.201"
org.eclipse.passage.lic.base;bundle-version="0.0.0"
Export-Package: org.eclipse.passage.lic.internal.licenses.convert;
x-friends:="org.eclipse.passage.lic.hc",
org.eclipse.passage.lic.internal.licenses.model;
Expand Down
11 changes: 11 additions & 0 deletions bundles/org.eclipse.passage.loc.api/.settings/.api_filters
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.passage.loc.api" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter id="927989779">
<message_arguments>
<message_argument value="1.1.0"/>
<message_argument value="org.eclipse.passage.lic.equinox"/>
</message_arguments>
</filter>
</resource>
</component>
18 changes: 9 additions & 9 deletions bundles/org.eclipse.passage.loc.api/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.passage.loc.api
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.passage.loc.api
Bundle-Version: 1.0.200.qualifier
Bundle-Version: 1.1.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-Copyright: %Bundle-Copyright
Expand Down Expand Up @@ -32,12 +32,12 @@ Require-Bundle: org.eclipse.e4.core.services;bundle-version="0.0.0",
org.eclipse.equinox.common;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.osgi.services;bundle-version="0.0.0",
org.eclipse.osgi;bundle-version="0.0.0",
org.eclipse.passage.lic.base;bundle-version="1.0.0",
org.eclipse.passage.lic.emf;bundle-version="1.0.0",
org.eclipse.passage.lic.equinox;bundle-version="1.0.0";visibility:=reexport,
org.eclipse.passage.lic.licenses;bundle-version="1.0.0";visibility:=reexport,
org.eclipse.passage.lic.products;bundle-version="1.0.0";visibility:=reexport,
org.eclipse.passage.lic.users;bundle-version="1.0.0";visibility:=reexport,
org.eclipse.passage.lic.users.model;bundle-version="1.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="1.1.0"
org.eclipse.passage.lic.base;bundle-version="0.0.0",
org.eclipse.passage.lic.emf;bundle-version="0.0.0",
org.eclipse.passage.lic.equinox;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.lic.licenses;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.lic.products;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.lic.users;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.lic.users.model;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0"
Bundle-ActivationPolicy: lazy
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ Require-Bundle: org.eclipse.e4.core.di.annotations;bundle-version="0.0.0",
org.eclipse.e4.ui.di;bundle-version="0.0.0",
org.eclipse.e4.ui.services;bundle-version="0.0.0",
org.eclipse.emf.ecp.ui.view.swt;bundle-version="0.0.0",
org.eclipse.passage.lic.emf;bundle-version="0.6.0",
org.eclipse.passage.lic.emf.meta;bundle-version="0.6.0",
org.eclipse.passage.lic.emf;bundle-version="0.0.0",
org.eclipse.passage.lic.emf.meta;bundle-version="0.0.0",
org.eclipse.passage.lic.e4.core;bundle-version="0.0.0",
org.eclipse.passage.lic.email;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0",
org.eclipse.passage.loc.api;bundle-version="0.0.0",
org.eclipse.passage.loc.workbench.emfforms;bundle-version="0.0.0",
org.eclipse.passage.loc.features.core;bundle-version="1.0.0",
org.eclipse.passage.loc.features.core;bundle-version="0.0.0",
org.eclipse.passage.loc.features.ui;bundle-version="0.0.0",
org.eclipse.passage.loc.licenses.core;bundle-version="0.6.0",
org.eclipse.passage.loc.licenses.core;bundle-version="0.0.0",
org.eclipse.passage.loc.products.ui;bundle-version="0.0.0",
org.eclipse.passage.loc.users.ui;bundle-version="0.0.0",
org.eclipse.passage.loc.licenses.ui;bundle-version="0.0.0"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.passage.loc.licenses.core" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter id="929038356">
<filter id="927989779">
<message_arguments>
<message_argument value="0.6.103"/>
<message_argument value="org.eclipse.passage.lic.licenses.model"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.osgi.services;bundle-version="0.0.0",
org.eclipse.osgi;bundle-version="0.0.0",
org.eclipse.passage.lic.email;bundle-version="0.0.0",
org.eclipse.passage.lic.emf;bundle-version="1.0.100",
org.eclipse.passage.lic.emf;bundle-version="0.0.0",
org.eclipse.passage.lic.equinox;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="1.1.0";visibility:=reexport,
org.eclipse.passage.lic.users.model;bundle-version="1.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.lic.users.model;bundle-version="0.0.0",
org.eclipse.passage.loc.api;bundle-version="0.0.0",
org.eclipse.passage.loc.products.core;bundle-version="0.6.0",
org.eclipse.passage.loc.users.core;bundle-version="1.0.0",
org.eclipse.passage.lic.base;bundle-version="1.0.100"
org.eclipse.passage.loc.products.core;bundle-version="0.0.0",
org.eclipse.passage.loc.users.core;bundle-version="0.0.0",
org.eclipse.passage.lic.base;bundle-version="0.0.0"
Export-Package: org.eclipse.passage.loc.internal.licenses;
x-friends:="org.eclipse.passage.loc.licenses.emfforms,
org.eclipse.passage.loc.licenses.ui,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ Require-Bundle: javax.inject;bundle-version="0.0.0",
org.eclipse.jface.databinding;bundle-version="0.0.0",
org.eclipse.osgi.services;bundle-version="0.0.0",
org.eclipse.passage.lic.emf;bundle-version="0.0.0",
org.eclipse.passage.lic.features.model;bundle-version="1.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="1.1.0",
org.eclipse.passage.lic.products.model;bundle-version="1.0.0",
org.eclipse.passage.lic.features.model;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0",
org.eclipse.passage.lic.products.model;bundle-version="0.0.0",
org.eclipse.passage.loc.features.emfforms;bundle-version="0.0.0",
org.eclipse.passage.loc.licenses.core;bundle-version="0.0.0",
org.eclipse.passage.loc.licenses.ui;bundle-version="0.0.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
org.eclipse.jface;bundle-version="0.0.0",
org.eclipse.passage.lic.emf;bundle-version="0.0.0",
org.eclipse.passage.lic.equinox;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses.e4.ui;bundle-version="0.5.201",
org.eclipse.passage.lic.licenses.e4.ui;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0",
org.eclipse.passage.loc.api;bundle-version="0.0.0",
org.eclipse.passage.loc.licenses.core;bundle-version="0.0.0",
org.eclipse.passage.loc.products.ui;bundle-version="0.0.0",
org.eclipse.passage.loc.users.ui;bundle-version="0.0.0",
org.eclipse.passage.loc.workbench;bundle-version="0.0.0",
org.eclipse.passage.loc.report.core;bundle-version="0.2.0",
org.eclipse.passage.loc.report.ui;bundle-version="0.2.0"
org.eclipse.passage.loc.report.core;bundle-version="0.0.0",
org.eclipse.passage.loc.report.ui;bundle-version="0.0.0"
Import-Package: javax.inject;version="1.0.0"
Export-Package: org.eclipse.passage.loc.internal.licenses.ui;x-friends:="org.eclipse.passage.loc.dashboard.ui",
org.eclipse.passage.loc.internal.licenses.ui.i18n;x-friends:="org.eclipse.passage.loc.dashboard.ui",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.passage.loc.report.core
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.passage.loc.report.core;singleton:=true
Bundle-Version: 0.2.100.qualifier
Bundle-Version: 0.2.200.qualifier
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-Copyright: %Bundle-Copyright
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.apache.commons.csv;bundle-version="1.4.0",
org.eclipse.osgi.services;bundle-version="3.8.0",
org.eclipse.passage.lic.licenses;bundle-version="1.0.0",
org.eclipse.passage.lic.licenses;bundle-version="1.1.0",
org.eclipse.passage.lic.users;bundle-version="0.5.0",
org.eclipse.passage.loc.licenses.core;bundle-version="0.6.0",
org.eclipse.passage.loc.products.core;bundle-version="0.6.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Automatic-Module-Name: org.eclipse.passage.loc.report.ui
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.passage.loc.report.ui;singleton:=true
Bundle-Version: 0.2.100.qualifier
Bundle-Version: 0.2.200.qualifier
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-Copyright: %Bundle-Copyright
Expand All @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
org.eclipse.jface;bundle-version="0.0.0",
org.eclipse.osgi.services;bundle-version="3.8.0",
org.eclipse.osgi;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses;bundle-version="1.0.0",
org.eclipse.passage.lic.licenses;bundle-version="1.1.0",
org.eclipse.passage.lic.products;bundle-version="1.0.0",
org.eclipse.passage.lic.users;bundle-version="1.0.0",
org.eclipse.passage.loc.products.ui;bundle-version="0.6.0",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.passage.loc.workbench.emfforms" version="2">
<resource path="META-INF/MANIFEST.MF">
<filter id="927989779">
<message_arguments>
<message_argument value="1.0.300"/>
<message_argument value="org.eclipse.passage.loc.workbench"/>
</message_arguments>
</filter>
</resource>
</component>
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ Require-Bundle: org.eclipse.osgi.services;bundle-version="0.0.0",
org.eclipse.emfforms.swt.core.di;bundle-version="0.0.0",
org.eclipse.emfforms.swt.treemasterdetail;bundle-version="0.0.0",
org.eclipse.emfforms.core.bazaar;bundle-version="0.0.0",
org.eclipse.passage.lic.api;bundle-version="1.0.0",
org.eclipse.passage.lic.api;bundle-version="0.0.0",
org.eclipse.passage.lic.base;bundle-version="0.0.0",
org.eclipse.passage.lic.emf;bundle-version="0.0.0",
org.eclipse.passage.loc.api;bundle-version="1.0.102",
org.eclipse.passage.loc.workbench;bundle-version="1.0.0";visibility:=reexport,
org.eclipse.passage.lic.licenses.model;bundle-version="1.1.0"
org.eclipse.passage.loc.api;bundle-version="0.0.0",
org.eclipse.passage.loc.workbench;bundle-version="0.0.0";visibility:=reexport,
org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.passage.loc.internal.workbench.emfforms;x-internal:=true,
org.eclipse.passage.loc.internal.workbench.emfforms.i18n;x-internal:=true,
Expand Down
12 changes: 6 additions & 6 deletions tests/org.eclipse.passage.lbc.base.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-Copyright: %Bundle-Copyright
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.passage.lic.base;bundle-version="1.0.0",
Require-Bundle: org.eclipse.passage.lic.base;bundle-version="0.0.0",
org.eclipse.passage.lic.bc;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses.migration;bundle-version="0.0.0",
org.eclipse.passage.lic.licenses.model;bundle-version="1.1.0",
org.eclipse.passage.lic.licenses.model;bundle-version="0.0.0",
org.junit;bundle-version="4.12.0",
org.eclipse.passage.lbc.base;bundle-version="1.0.0",
org.eclipse.passage.lic.net;bundle-version="1.0.1",
org.eclipse.passage.lic.emf;bundle-version="1.0.100",
org.eclipse.passage.lbc.fls.gear;bundle-version="0.1.0"
org.eclipse.passage.lbc.base;bundle-version="0.0.0",
org.eclipse.passage.lic.net;bundle-version="0.0.0",
org.eclipse.passage.lic.emf;bundle-version="0.0.0",
org.eclipse.passage.lbc.fls.gear;bundle-version="0.0.0"
Export-Package: org.eclipse.passage.lbc.base.tests;x-friends:="org.eclipse.passage.lic.hc.tests"

0 comments on commit d2b56b3

Please sign in to comment.