Skip to content

Commit

Permalink
[#182] Add required 3rd party bundles
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Fedorov <[email protected]>
  • Loading branch information
ruspl-afed committed Jul 13, 2023
1 parent 4721d5e commit f07f163
Show file tree
Hide file tree
Showing 18 changed files with 71 additions and 36 deletions.
16 changes: 11 additions & 5 deletions mylyn.commons/org.eclipse.mylyn.commons.net/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ Bundle-Version: 4.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.apache.commons.codec;bundle-version="1.3.0";visibility:=reexport,
org.apache.commons.httpclient;bundle-version="[3.1.0,4.0.0)";visibility:=reexport,
org.apache.commons.lang;bundle-version="[2.6.0,3.0.0)";visibility:=reexport,
org.eclipse.core.net;bundle-version="0.0.0",
Require-Bundle: org.eclipse.core.net;bundle-version="0.0.0",
org.eclipse.core.runtime;bundle-version="0.0.0",
org.eclipse.mylyn.commons.core;bundle-version="4.0.0"
Bundle-ClassPath: .
Expand All @@ -19,4 +16,13 @@ Export-Package: org.eclipse.mylyn.commons.net,
org.eclipse.mylyn.internal.commons.net.http;x-internal:=true
Bundle-Activator: org.eclipse.mylyn.internal.commons.net.CommonsNetPlugin
Bundle-Localization: plugin
Import-Package: org.apache.commons.logging;version="[1.0.4,2.0.0)"
Import-Package: org.apache.commons.httpclient;version="3.1.0",
org.apache.commons.httpclient.auth;version="3.1.0",
org.apache.commons.httpclient.cookie;version="3.1.0",
org.apache.commons.httpclient.methods;version="3.1.0",
org.apache.commons.httpclient.methods.multipart;version="3.1.0",
org.apache.commons.httpclient.params;version="3.1.0",
org.apache.commons.httpclient.protocol;version="3.1.0",
org.apache.commons.httpclient.util;version="3.1.0",
org.apache.commons.lang;version="2.6.0",
org.apache.commons.logging;version="[1.0.4,2.0.0)"
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ Export-Package: org.eclipse.mylyn.commons.core;x-internal:=true,
org.eclipse.mylyn.commons.tests.workbench.browser;x-internal:=true,
org.eclipse.mylyn.commons.tests.xmlrpc;x-internal:=true,
org.eclipse.mylyn.commons.ui.screenshots;x-internal:=true
Import-Package: org.apache.xmlrpc;version="3.1.3",
Import-Package: org.apache.commons.httpclient;version="3.1.0",
org.apache.commons.httpclient.methods;version="3.1.0",
org.apache.commons.httpclient.params;version="3.1.0",
org.apache.commons.httpclient.protocol;version="3.1.0",
org.apache.xmlrpc;version="3.1.3",
org.apache.xmlrpc.server;version="3.1.3",
org.apache.xmlrpc.webserver;version="3.1.3"
Bundle-Vendor: Eclipse Mylyn
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
org.eclipse.mylyn.commons.net;bundle-version="4.0.0"
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.mylyn.internal.commons.xmlrpc;x-internal:=true
Import-Package: org.apache.xmlrpc;version="3.1.3",
Import-Package: org.apache.commons.httpclient;version="3.1.0",
org.apache.commons.httpclient.auth;version="3.1.0",
org.apache.commons.httpclient.cookie;version="3.1.0",
org.apache.commons.httpclient.methods;version="3.1.0",
org.apache.commons.httpclient.params;version="3.1.0",
org.apache.xmlrpc;version="3.1.3",
org.apache.xmlrpc.client;version="3.1.3",
org.apache.xmlrpc.common;version="3.1.3",
org.apache.xmlrpc.serializer;version="3.1.3",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="0.0.0",
Export-Package: org.eclipse.mylyn.internal.discovery.core;x-friends:="org.eclipse.mylyn.discovery.ui",
org.eclipse.mylyn.internal.discovery.core.model;x-friends:="org.eclipse.mylyn.discovery.ui",
org.eclipse.mylyn.internal.discovery.core.util;x-friends:="org.eclipse.mylyn.discovery.ui"
Import-Package: org.apache.commons.httpclient;version="3.1.0",
org.apache.commons.httpclient.methods;version="3.1.0",
org.apache.commons.httpclient.util;version="3.1.0"
Bundle-Localization: plugin
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ Export-Package: org.eclipse.mylyn.internal.github.ui;version="6.2.1";x-internal:
org.eclipse.mylyn.internal.github.ui.issue;version="6.2.1";x-internal:=true,
org.eclipse.mylyn.internal.github.ui.pr;version="6.2.1";x-internal:=true
Bundle-ActivationPolicy: lazy
Import-Package: org.eclipse.egit.core;version="[6.2.0,7.0.0)",
Import-Package: org.apache.commons.lang;version="2.6.0",
org.eclipse.egit.core;version="[6.2.0,7.0.0)",
org.eclipse.egit.core.op;version="[6.2.0,7.0.0)",
org.eclipse.egit.core.settings;version="[6.2.0,7.0.0)",
org.eclipse.egit.github.core;version="[6.1.0,7.0.0)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ Export-Package: org.eclipse.mylyn.internal.gerrit.core;x-internal:=true,
org.eclipse.mylyn.internal.gerrit.core.client;x-internal:=true,
org.eclipse.mylyn.internal.gerrit.core.egit;x-internal:=true,
org.eclipse.mylyn.internal.gerrit.core.remote;x-internal:=true
Import-Package: com.google.gerrit.reviewdb;version="2.1.5"
Import-Package: com.google.gerrit.reviewdb;version="2.1.5",
org.apache.commons.httpclient;version="3.1.0",
org.apache.commons.httpclient.methods;version="3.1.0"
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,9 @@ Import-Package: com.google.common.base;version="15.0.0",
com.google.gwtjsonrpc.server;version="1.2.4",
com.google.gwtorm.client;version="1.1.4",
com.google.gwtorm.server;version="1.1.4",
org.apache.commons.io;version="1.4.0"
org.apache.commons.httpclient;version="3.1.0",
org.apache.commons.httpclient.auth;version="3.1.0",
org.apache.commons.httpclient.methods;version="3.1.0",
org.apache.commons.httpclient.util;version="3.1.0",
org.apache.commons.io;version="1.4.0",
org.apache.commons.lang;version="2.6.0"
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,10 @@ Import-Package: com.google.gerrit.common.data;version="2.1.5",
com.google.gwtjsonrpc.client;version="1.2.5",
com.google.gwtorm.client;version="1.1.4",
javax.servlet;version="4.0.0",
org.apache.commons.io;version="2.8.0"
org.apache.commons.httpclient;version="3.1.0",
org.apache.commons.httpclient.methods;version="3.1.0",
org.apache.commons.io;version="2.8.0",
org.apache.commons.lang;version="2.6.0"
Export-Package: org.eclipse.mylyn.gerrit.tests;x-internal:=true,
org.eclipse.mylyn.gerrit.tests.core;x-internal:=true,
org.eclipse.mylyn.gerrit.tests.core.client;x-internal:=true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,6 @@ Import-Package: com.google.gerrit.common;version="2.1.5",
com.google.gson;version="2.9.1",
com.google.gwtjsonrpc.client;version="1.2.4",
com.google.gwtorm.client;version="1.1.4",
org.apache.commons.io;version="2.8.0"
org.apache.commons.io;version="2.8.0",
org.apache.commons.lang;version="2.6.0",
org.apache.commons.lang.reflect;version="2.6.0"
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.mylyn.internal.bugzilla.rest.core,
org.eclipse.mylyn.internal.bugzilla.rest.core.response.data
Import-Package: org.apache.commons.codec;version="1.14.0",
org.apache.commons.lang;version="2.6.0"
Bundle-Vendor: Eclipse Mylyn
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ Bundle-Vendor: %Bundle-Vendor
Bundle-ClassPath: .
Export-Package: org.eclipse.mylyn.internal.bugzilla.core;x-friends:="org.eclipse.mylyn.bugzilla.ide,org.eclipse.mylyn.bugzilla.ui",
org.eclipse.mylyn.internal.bugzilla.core.service;x-internal:=true
Import-Package: org.apache.xmlrpc
Import-Package: org.apache.commons.httpclient;version="3.1.0",
org.apache.commons.httpclient.methods;version="3.1.0",
org.apache.commons.httpclient.methods.multipart;version="3.1.0",
org.apache.commons.httpclient.params;version="3.1.0",
org.apache.commons.httpclient.util;version="3.1.0",
org.apache.commons.lang;version="2.6.0",
org.apache.xmlrpc
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Localization: plugin
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ Export-Package: org.eclipse.mylyn.bugzilla.tests;x-internal:=true,
org.eclipse.mylyn.bugzilla.tests.core;x-internal:=true,
org.eclipse.mylyn.bugzilla.tests.support;x-internal:=true,
org.eclipse.mylyn.bugzilla.tests.ui;x-internal:=true
Import-Package: org.apache.xmlrpc;version="0.0.0"
Import-Package: org.apache.commons.httpclient;version="3.1.0",
org.apache.xmlrpc;version="0.0.0"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@ Export-Package: org.eclipse.mylyn.internal.trac.core;x-friends:="org.eclipse.myl
org.eclipse.mylyn.internal.trac.core.client;x-friends:="org.eclipse.mylyn.trac.ui",
org.eclipse.mylyn.internal.trac.core.model;x-friends:="org.eclipse.mylyn.trac.ui",
org.eclipse.mylyn.internal.trac.core.util;x-friends:="org.eclipse.mylyn.trac.ui"
Import-Package: org.apache.xmlrpc,
Import-Package: org.apache.commons.httpclient;version="3.1.0",
org.apache.commons.httpclient.auth;version="3.1.0",
org.apache.commons.httpclient.cookie;version="3.1.0",
org.apache.commons.httpclient.methods;version="3.1.0",
org.apache.commons.httpclient.params;version="3.1.0",
org.apache.commons.lang;version="2.6.0",
org.apache.xmlrpc,
org.apache.xmlrpc.client,
org.apache.xmlrpc.common,
org.apache.xmlrpc.serializer,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ Export-Package: org.eclipse.mylyn.trac.tests;x-internal:=true,
org.eclipse.mylyn.trac.tests.core;x-internal:=true,
org.eclipse.mylyn.trac.tests.support;x-internal:=true,
org.eclipse.mylyn.trac.tests.ui;x-internal:=true
Import-Package: org.apache.xmlrpc;version="0.0.0",
Import-Package: org.apache.commons.httpclient;version="3.1.0",
org.apache.xmlrpc;version="0.0.0",
org.apache.xmlrpc.client,
org.apache.xmlrpc.common
Bundle-RequiredExecutionEnvironment: JavaSE-17
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ Export-Package: org.eclipse.mylyn.internal.tasks.core;x-friends:="org.eclipse.my
org.eclipse.mylyn.tasks.core.data,
org.eclipse.mylyn.tasks.core.spi,
org.eclipse.mylyn.tasks.core.sync
Import-Package: org.apache.commons.httpclient.methods.multipart;version="3.1.0"
Bundle-Localization: plugin
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@ Export-Package: org.eclipse.mylyn.tasks.tests;x-internal:=true,
org.eclipse.mylyn.tasks.tests.ui;x-internal:=true,
org.eclipse.mylyn.tasks.tests.ui.editor;x-internal:=true,
org.eclipse.mylyn.tasks.tests.util;x-internal:=true
Import-Package: org.apache.commons.lang;version="2.6.0"
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-ActivationPolicy: lazy
3 changes: 3 additions & 0 deletions mylyn.tasks/org.eclipse.mylyn.tasks.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,7 @@ Export-Package: org.eclipse.mylyn.internal.provisional.tasks.ui.wizards;x-intern
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Localization: plugin
Import-Package: com.ibm.icu.text,
org.apache.commons.httpclient;version="3.1.0",
org.apache.commons.lang;version="2.6.0",
org.apache.commons.lang.reflect;version="2.6.0",
org.apache.commons.logging;version="[1.0.4,2.0.0)"
23 changes: 3 additions & 20 deletions org.eclipse.mylyn-site/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,24 @@
<feature id="org.eclipse.mylyn.context.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.tasks.feature">
<category name="org.eclipse.mylyn.features.category"/>
</feature>
<feature id="org.eclipse.mylyn.tasks.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.cdt.feature">
<category name="org.eclipse.mylyn.integrations.category"/>
</feature>
<feature id="org.eclipse.mylyn.cdt.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.discovery.feature">
<category name="org.eclipse.mylyn.integrations.category"/>
</feature>
<feature id="org.eclipse.mylyn.discovery.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.gerrit.feature">
<category name="org.eclipse.mylyn.integrations.category"/>
</feature>
Expand All @@ -54,84 +50,72 @@
<feature id="org.eclipse.mylyn.gerrit.dashboard.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.git.feature">
<category name="org.eclipse.mylyn.integrations.category"/>
</feature>
<feature id="org.eclipse.mylyn.git.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.jenkins.feature">
<category name="org.eclipse.mylyn.integrations.category"/>
</feature>
<feature id="org.eclipse.mylyn.jenkins.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.ide.feature">
<category name="org.eclipse.mylyn.integrations.category"/>
</feature>
<feature id="org.eclipse.mylyn.ide.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.jdt.feature">
<category name="org.eclipse.mylyn.integrations.category"/>
</feature>
<feature id="org.eclipse.mylyn.jdt.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.pde.feature">
<category name="org.eclipse.mylyn.integrations.category"/>
</feature>
<feature id="org.eclipse.mylyn.pde.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.team.feature">
<category name="org.eclipse.mylyn.integrations.category"/>
</feature>
<feature id="org.eclipse.mylyn.team.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.egit.feature">
<category name="org.eclipse.mylyn.integrations.category"/>
</feature>
<feature id="org.eclipse.mylyn.egit.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.bugzilla.feature">
<category name="a.tasks.connector"/>
</feature>
<feature id="org.eclipse.mylyn.bugzilla.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.trac.feature">
<category name="a.tasks.connector"/>
</feature>
<feature id="org.eclipse.mylyn.trac.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.github.feature">
<category name="a.tasks.connector"/>
</feature>
<feature id="org.eclipse.mylyn.github.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.builds.feature">
<category name="org.eclipse.mylyn.framework.category"/>
</feature>
<feature id="org.eclipse.mylyn.builds.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.commons.feature">
<category name="org.eclipse.mylyn.framework.category"/>
</feature>
Expand Down Expand Up @@ -162,34 +146,33 @@
<feature id="org.eclipse.mylyn.commons.repositories.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.monitor.feature">
<category name="org.eclipse.mylyn.framework.category"/>
</feature>
<feature id="org.eclipse.mylyn.monitor.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.reviews.feature">
<category name="org.eclipse.mylyn.framework.category"/>
</feature>
<feature id="org.eclipse.mylyn.reviews.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<feature id="org.eclipse.mylyn.versions.feature">
<category name="org.eclipse.mylyn.framework.category"/>
</feature>
<feature id="org.eclipse.mylyn.versions.feature.source">
<category name="org.eclipse.mylyn.sdk.source.category"/>
</feature>

<bundle id="com.sun.xml.bind"/>
<bundle id="jakarta.xml.bind"/>
<bundle id="javax.activation" version="1.2.2.v20221203-1659"/>
<bundle id="javax.activation" version="2.0.0.v20221203-1659"/>
<bundle id="javax.xml.stream"/>
<bundle id="org.glassfish.hk2.osgi-resource-locator"/>
<bundle id="org.apache.commons.codec"/>
<bundle id="org.apache.commons.httpclient"/>
<bundle id="org.apache.commons.lang"/>
<bundle id="org.apache.commons.logging"/>
<bundle id="org.apache.lucene.analysis-common"/>
<bundle id="org.apache.lucene.core"/>
Expand Down

0 comments on commit f07f163

Please sign in to comment.