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 2019/04/17 05:03:20 UTC
[directory-studio] branch remove-jndi-provider-and-jndi-layer
updated: DIRSTUDIO-1222: Update to Eclipse 2019-03
This is an automated email from the ASF dual-hosted git repository.
seelmann pushed a commit to branch remove-jndi-provider-and-jndi-layer
in repository https://gitbox.apache.org/repos/asf/directory-studio.git
The following commit(s) were added to refs/heads/remove-jndi-provider-and-jndi-layer by this push:
new 83ef3b1 DIRSTUDIO-1222: Update to Eclipse 2019-03
83ef3b1 is described below
commit 83ef3b16a9de359747ce8c62443b3664484b3ca8
Author: Stefan Seelmann <ma...@stefan-seelmann.de>
AuthorDate: Wed Apr 17 07:02:59 2019 +0200
DIRSTUDIO-1222: Update to Eclipse 2019-03
---
README.md | 2 +-
...directory.studio.eclipse-trgt-platform.template | 29 +++++++++++-----------
features/rcp.feature/feature.xml | 2 +-
pom.xml | 14 +----------
product/org.apache.directory.studio.product | 11 +++-----
5 files changed, 20 insertions(+), 38 deletions(-)
diff --git a/README.md b/README.md
index 6dbb123..625348c 100644
--- a/README.md
+++ b/README.md
@@ -328,6 +328,6 @@ Start OSGi console:
List all IUs within a repository:
- provliu http://download.eclipse.org/eclipse/updates/4.7/ *
+ provliu http://download.eclipse.org/eclipse/updates/4.11/
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 ec80230..0cec0ff 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="397">
+<target name="Apache Directory Studio Platform" sequenceNumber="411">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -106,25 +106,25 @@
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.rcp.feature.group" version="4.9.0.v20180906-1121"/>
- <unit id="org.eclipse.rcp.source.feature.group" version="4.9.0.v20180906-1121"/>
- <unit id="org.eclipse.platform.feature.group" version="4.9.0.v20180906-1121"/>
- <unit id="org.eclipse.platform.source.feature.group" version="4.9.0.v20180906-1121"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.15.0.v20180906-0745"/>
- <unit id="org.eclipse.jdt.source.feature.group" version="3.15.0.v20180906-0745"/>
- <unit id="org.eclipse.pde.feature.group" version="3.13.200.v20180906-0745"/>
- <unit id="org.eclipse.pde.source.feature.group" version="3.13.200.v20180906-0745"/>
- <unit id="org.eclipse.equinox.p2.user.ui.feature.group" version="2.4.100.v20180829-1443"/>
- <unit id="org.eclipse.equinox.executable.feature.group" version="3.8.100.v20180827-1352"/>
- <repository location="http://download.eclipse.org/eclipse/updates/4.9"/>
+ <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"/>
</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"/>
- <unit id="org.bouncycastle.bcprov" version="1.52.0.v20180328-2148"/>
- <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20180606145124/repository/"/>
+ <unit id="org.bouncycastle.bcprov" version="1.60.0.v20181210-2057"/>
+ <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20190226160451/repository/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -139,7 +139,6 @@
<unit id="org.eclipse.babel.nls_eclipse_de.feature.group" version="0.0.0"/>
<unit id="org.eclipse.babel.nls_eclipse_fr.feature.group" version="0.0.0"/>
<repository location="http://archive.eclipse.org/technology/babel/update-site/R0.15.1/oxygen"/>
- <!--<repository location="http://download.eclipse.org/technology/babel/update-site/R0.16.1/2018-12"/>-->
</location>
</locations>
diff --git a/features/rcp.feature/feature.xml b/features/rcp.feature/feature.xml
index 403fd82..bcf27cc 100644
--- a/features/rcp.feature/feature.xml
+++ b/features/rcp.feature/feature.xml
@@ -211,7 +211,7 @@ http://www.apache.org/licenses/
unpack="false"/>
<plugin
- id="org.apache.commons.codec"
+ id="org.apache.commons.commons-codec"
download-size="0"
install-size="0"
version="0.0.0"
diff --git a/pom.xml b/pom.xml
index 2e9e3a3..62497a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
- <tycho.version>1.2.0</tycho.version>
+ <tycho.version>1.4.0</tycho.version>
<!-- Set versions for dependencies -->
<antlr.version>2.7.7</antlr.version>
@@ -163,24 +163,12 @@
<environment>
<os>linux</os>
<ws>gtk</ws>
- <arch>x86</arch>
- </environment>
-
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
<arch>x86_64</arch>
</environment>
<environment>
<os>win32</os>
<ws>win32</ws>
- <arch>x86</arch>
- </environment>
-
- <environment>
- <os>win32</os>
- <ws>win32</ws>
<arch>x86_64</arch>
</environment>
diff --git a/product/org.apache.directory.studio.product b/product/org.apache.directory.studio.product
index c024588..6dca0e8 100644
--- a/product/org.apache.directory.studio.product
+++ b/product/org.apache.directory.studio.product
@@ -16,9 +16,6 @@
<launcherArgs>
<programArgs>/studio-rcp/resources/icons/linux/studio.xpm
</programArgs>
- <programArgsLin>--launcher.GTK_version
-2
- </programArgsLin>
<vmArgs>-Dosgi.requiredJavaVersion=1.8
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
@@ -35,7 +32,6 @@
<launcher name="ApacheDirectoryStudio">
<linux icon="icons/linux/studio.xpm"/>
<macosx icon="icons/macosx/studio.icns"/>
- <solaris/>
<win useIco="true">
<ico path="icons/windows/studio.ico"/>
<bmp/>
@@ -257,12 +253,11 @@ http://www.apache.org/licenses/
</features>
<configurations>
- <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="4" />
+ <plugin id="org.apache.felix.scr" autoStart="true" startLevel="2" />
+ <plugin id="org.eclipse.core.runtime" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.ds" autoStart="true" startLevel="2" />
- <plugin id="org.eclipse.equinox.p2.reconciler.dropins" autoStart="true" startLevel="4" />
+ <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="2" />
<plugin id="org.eclipse.equinox.simpleconfigurator" autoStart="true" startLevel="1" />
- <plugin id="org.eclipse.update.configurator" autoStart="true" startLevel="4" />
<property name="org.eclipse.update.reconcile" value="false" />
<property name="osgi.instance.area.default" value="@user.home/.ApacheDirectoryStudio" />
</configurations>