You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2020/04/01 17:48:42 UTC
[directory-studio] branch master updated: DIRSTUDIO-1222: Update to
Eclipse 2020-03
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-studio.git
The following commit(s) were added to refs/heads/master by this push:
new 7eff154 DIRSTUDIO-1222: Update to Eclipse 2020-03
7eff154 is described below
commit 7eff154afa7095ddcb3b9699eeaef1d4d6415759
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Wed Apr 1 19:48:26 2020 +0200
DIRSTUDIO-1222: Update to Eclipse 2020-03
---
README.md | 2 +-
...directory.studio.eclipse-trgt-platform.template | 30 +++++++++++-----------
plugins/connection.core/pom-first.xml | 3 ++-
pom.xml | 5 ----
product/org.apache.directory.studio.product | 3 +--
5 files changed, 19 insertions(+), 24 deletions(-)
diff --git a/README.md b/README.md
index 62e2c78..bab1b73 100644
--- a/README.md
+++ b/README.md
@@ -327,6 +327,6 @@ Start OSGi console:
List all IUs within a repository:
- provliu http://download.eclipse.org/eclipse/updates/4.11/
+ provliu http://download.eclipse.org/eclipse/updates/4.15/
diff --git a/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template b/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
index 27748b0..8469d58 100644
--- a/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
+++ b/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
@@ -19,7 +19,7 @@
@author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
-->
<?pde version="3.8"?>
-<target name="Apache Directory Studio Platform" sequenceNumber="445">
+<target name="Apache Directory Studio Platform" sequenceNumber="449">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -106,32 +106,32 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.rcp.feature.group" version="4.11.0.v20190307-0500"/>
- <unit id="org.eclipse.rcp.source.feature.group" version="4.11.0.v20190307-0500"/>
- <unit id="org.eclipse.platform.feature.group" version="4.11.0.v20190307-0500"/>
- <unit id="org.eclipse.platform.source.feature.group" version="4.11.0.v20190307-0500"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.17.0.v20190307-0500"/>
- <unit id="org.eclipse.jdt.source.feature.group" version="3.17.0.v20190307-0500"/>
- <unit id="org.eclipse.pde.feature.group" version="3.13.400.v20190307-0943"/>
- <unit id="org.eclipse.pde.source.feature.group" version="3.13.400.v20190307-0943"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.4.300.v20190220-1158"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.300.v20190213-1655"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.11"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.15.0.v20200305-0155"/>
+ <unit id="org.eclipse.rcp.source.feature.group" version="4.15.0.v20200305-0155"/>
+ <unit id="org.eclipse.platform.feature.group" version="4.15.0.v20200305-0155"/>
+ <unit id="org.eclipse.platform.source.feature.group" version="4.15.0.v20200305-0155"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.18.300.v20200305-0155"/>
+ <unit id="org.eclipse.jdt.source.feature.group" version="3.18.300.v20200305-0155"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.14.300.v20200305-0155"/>
+ <unit id="org.eclipse.pde.source.feature.group" version="3.14.300.v20200305-0155"/>
+ <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.4.700.v20200222-1600"/>
+ <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.700.v20200207-2156"/>
+ <repository location="http://download.eclipse.org/eclipse/updates/4.15"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
<unit id="org.slf4j.api" version="1.7.2.v20121108-1250"/>
<unit id="org.slf4j.log4j" version="1.7.2.v20130115-1340"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20200224183213/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.7.0.201806111355"/>
+ <unit id="org.eclipse.swtbot.eclipse.feature.group" version="2.8.0.201906121535"/>
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
<unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
- <repository location="http://download.eclipse.org/technology/swtbot/releases/2.7.0/"/>
+ <repository location="http://download.eclipse.org/technology/swtbot/releases/2.8.0/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/plugins/connection.core/pom-first.xml b/plugins/connection.core/pom-first.xml
index 5a128cb..d8076c0 100644
--- a/plugins/connection.core/pom-first.xml
+++ b/plugins/connection.core/pom-first.xml
@@ -55,7 +55,7 @@
<Import-Package>
org.apache.commons.lang3,
org.apache.commons.lang3.exception,
- org.apache.commons.codec.digest,
+ org.apache.commons.codec.digest",
org.apache.http.conn.ssl,
org.dom4j,
org.dom4j.io
@@ -71,6 +71,7 @@
org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
org.apache.directory.studio.common.core,
org.apache.directory.studio.ldifparser,
+ org.apache.commons.codec,
org.eclipse.core.runtime,
org.eclipse.ui
</Require-Bundle>
diff --git a/pom.xml b/pom.xml
index 6cd6a48..3e00f44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,11 +106,6 @@
<!-- Set versions for skins -->
<skin.version>1.0.2</skin.version>
-
- <!-- The repositories -->
- <juno-repo.url>http://download.eclipse.org/releases/juno</juno-repo.url>
- <kepler-repo.url>http://download.eclipse.org/releases/kepler</kepler-repo.url>
- <luna-repo.url>http://download.eclipse.org/releases/luna</luna-repo.url>
</properties>
<modules>
diff --git a/product/org.apache.directory.studio.product b/product/org.apache.directory.studio.product
index 6dca0e8..35001b1 100644
--- a/product/org.apache.directory.studio.product
+++ b/product/org.apache.directory.studio.product
@@ -239,13 +239,12 @@ http://www.apache.org/licenses/
<feature id="org.eclipse.e4.rcp"/>
<feature id="org.eclipse.emf.common"/>
<feature id="org.eclipse.platform"/>
- <feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
+ <feature id="org.eclipse.ecf.filetransfer.httpclient45.feature"/>
<feature id="org.eclipse.ecf.filetransfer.feature"/>
<feature id="org.eclipse.equinox.p2.core.feature"/>
<feature id="org.eclipse.ecf.core.ssl.feature"/>
<feature id="org.eclipse.ecf.core.feature"/>
<feature id="org.eclipse.help"/>
- <feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
<feature id="org.eclipse.equinox.p2.rcp.feature"/>
<feature id="org.eclipse.equinox.p2.user.ui"/>
<feature id="org.eclipse.equinox.p2.extras.feature"/>