Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 28543 invoked from network); 5 Jan 2011 12:44:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 5 Jan 2011 12:44:12 -0000 Received: (qmail 51718 invoked by uid 500); 5 Jan 2011 12:44:12 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 51666 invoked by uid 500); 5 Jan 2011 12:44:11 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 51659 invoked by uid 99); 5 Jan 2011 12:44:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jan 2011 12:44:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Jan 2011 12:44:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C55592388A38; Wed, 5 Jan 2011 12:43:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1055446 - in /directory/studio/trunk: application/application-eclipse-plugins/pom.xml application/application-macosx/pom.xml pom.xml Date: Wed, 05 Jan 2011 12:43:44 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110105124344.C55592388A38@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Wed Jan 5 12:43:44 2011 New Revision: 1055446 URL: http://svn.apache.org/viewvc?rev=1055446&view=rev Log: Part of a fix for DIRSTUDIO-718 (Update Eclipse dependencies to version 3.6.1). Updated most of the Eclipse dependencies to version 3.6.1. Mac OS X 64 Bit version of Apache Directory Studio working (other versions need to be updated). [Chunk 7] Modified: directory/studio/trunk/application/application-eclipse-plugins/pom.xml directory/studio/trunk/application/application-macosx/pom.xml directory/studio/trunk/pom.xml Modified: directory/studio/trunk/application/application-eclipse-plugins/pom.xml URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-eclipse-plugins/pom.xml?rev=1055446&r1=1055445&r2=1055446&view=diff ============================================================================== --- directory/studio/trunk/application/application-eclipse-plugins/pom.xml (original) +++ directory/studio/trunk/application/application-eclipse-plugins/pom.xml Wed Jan 5 12:43:44 2011 @@ -139,10 +139,6 @@ resources - org.eclipse.core.resources - compatibility - - org.eclipse.core runtime @@ -220,14 +216,46 @@ org.eclipse.equinox.p2 + console + + + org.eclipse.equinox.p2 core org.eclipse.equinox.p2 + director + + + org.eclipse.equinox.p2.director + app + + + org.eclipse.equinox.p2 + directorywatcher + + + org.eclipse.equinox.p2 + discovery + + + org.eclipse.equinox.p2.discovery + compatibility + + + org.eclipse.equinox.p2 engine org.eclipse.equinox.p2 + extensionlocation + + + org.eclipse.equinox.p2 + garbagecollector + + + org.eclipse.equinox.p2 jarprocessor @@ -236,13 +264,69 @@ org.eclipse.equinox.p2.metadata + generator + + + org.eclipse.equinox.p2.metadata repository org.eclipse.equinox.p2 + operations + + + org.eclipse.equinox.p2 + publisher + + + org.eclipse.equinox.p2 + ql + + + org.eclipse.equinox.p2.reconciler + dropins + + + org.eclipse.equinox.p2 repository + org.eclipse.equinox.p2.repository + tools + + + org.eclipse.equinox.p2.touchpoint + eclipse + + + org.eclipse.equinox.p2.touchpoint + natives + + + org.eclipse.equinox.p2 + ui + + + org.eclipse.equinox.p2.ui + discovery + + + org.eclipse.equinox.p2.ui + sdk + + + org.eclipse.equinox.p2.ui.sdk + scheduler + + + org.eclipse.equinox.p2 + updatechecker + + + org.eclipse.equinox.p2 + updatesite + + org.eclipse.equinox preferences @@ -255,6 +339,14 @@ security + org.eclipse.equinox + simpleconfigurator + + + org.eclipse.equinox.simpleconfigurator + manipulator + + org.eclipse help @@ -458,6 +550,16 @@ registry zip + + org.eclipse.epp.package + java + zip + + + org.eclipse + platform + zip + Modified: directory/studio/trunk/application/application-macosx/pom.xml URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-macosx/pom.xml?rev=1055446&r1=1055445&r2=1055446&view=diff ============================================================================== --- directory/studio/trunk/application/application-macosx/pom.xml (original) +++ directory/studio/trunk/application/application-macosx/pom.xml Wed Jan 5 12:43:44 2011 @@ -44,18 +44,18 @@ maven-dependency-plugin - copy-studio-launcher-macosx + unpack-launcher generate-resources - copy + unpack + ${app-dir} - org.apache.directory.studio - launcher-macosx - tar.gz - ${project.build.directory} + org.apache.directory.studio.launcher.macosx + x86_64 + zip @@ -98,21 +98,6 @@ org.apache.maven.plugins maven-antrun-plugin - - - unpack-studio-launcher-macosx - generate-resources - - - - - - - - - run - - copy-plugins-features @@ -164,11 +149,11 @@ org.eclipse.ui - carbon + cocoa - org.eclipse.swt.carbon - macosx + org.eclipse.swt.cocoa.macosx + x86_64 @@ -184,8 +169,8 @@ ${plugins-dir} - org.eclipse.equinox.launcher.carbon - macosx + org.eclipse.equinox.launcher.cocoa.macosx + x86_64 zip Modified: directory/studio/trunk/pom.xml URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=1055446&r1=1055445&r2=1055446&view=diff ============================================================================== --- directory/studio/trunk/pom.xml (original) +++ directory/studio/trunk/pom.xml Wed Jan 5 12:43:44 2011 @@ -566,10 +566,10 @@ 1.1.0 - org.apache.directory.studio - launcher-macosx - tar.gz - 1.5.3 + org.apache.directory.studio.launcher.macosx + x86_64 + zip + 2.0 org.apache.directory.studio @@ -582,12 +582,12 @@ com.ibm icu - 4.0.1.v20090822 + 4.2.1.v20100412 javax servlet - 2.5.0.v200806031605 + 2.5.0.v200910301333 javax.servlet @@ -597,82 +597,82 @@ org.apache.commons el - 1.0.0.v200806031608 + 1.0.0.v201004212143 org.apache.commons logging - 1.0.4.v200904062259 + 1.0.4.v201005080501 org.apache jasper - 5.5.17.v200903231320 + 5.5.17.v201004212143 org.apache lucene - 1.9.1.v20080530-1600 + 1.9.1.v20100518-1140 org.apache.lucene analysis - 1.9.1.v20080530-1600 + 1.9.1.v20100518-1140 org.eclipse compare - 3.5.2.r35x_20100113-0800-studio + 3.5.100.I20100526-0800 org.eclipse.compare core - 3.5.0.I20090430-0408 + 3.5.100.I20100526-0800 org.eclipse.core boot - 3.1.100.v20080218 + 3.1.200.v20100505 org.eclipse.core commands - 3.5.0.I20090525-2000 + 3.6.0.I20100512-1500 org.eclipse.core contenttype - 3.4.1.R35x_v20090826-0451 + 3.4.100.v20100505-1235 org.eclipse.core databinding - 1.2.0.M20090819-0800 + 1.3.100.I20100601-0800 org.eclipse.core.databinding observable - 1.2.0.M20090902-0800 + 1.3.0.I20100601-0800 org.eclipse.core.databinding property - 1.2.0.M20090819-0800 + 1.3.0.I20100601-0800 org.eclipse.core expressions - 3.4.101.R35x_v20100209 + 3.4.200.v20100505 org.eclipse.core filebuffers - 3.5.0.v20090526-2000 + 3.5.100.v20100520-0800 org.eclipse.core filesystem - 1.2.1.R35x_v20091203-1235 + 1.3.1.R36x_v20100727-0745 org.eclipse.core.filesystem.linux @@ -687,7 +687,7 @@ org.eclipse.core.filesystem macosx - 1.2.0.R35x_v20091203-1235 + 1.3.0.v20100505 org.eclipse.core.filesystem.win32 @@ -697,123 +697,124 @@ org.eclipse.core jobs - 3.4.100.v20090429-1800 + 3.5.1.R36x_v20100824 org.eclipse.core net - 1.2.1.r35x_20090812-1200 + 1.2.100.I20100511-0800 org.eclipse.core resources - 3.5.2.R35x_v20091203-1235 - - - org.eclipse.core.resources - compatibility - 3.4.1.R35x_v20100113-0530 + 3.6.0.R36x_v20100825-0600 org.eclipse.core runtime - 3.5.0.v20090525 + 3.6.0.v20100505 org.eclipse.core.runtime compatibility - 3.2.0.v20090413 + 3.2.100.v20100505 org.eclipse.core.runtime.compatibility auth - 3.2.100.v20090413 + 3.2.200.v20100517 org.eclipse.core.runtime.compatibility registry - 3.2.200.v20090429-1800 + 3.3.0.v20100520 zip org.eclipse.core variables - 3.2.200.v20090521 + 3.2.400.v20100505 org.eclipse.debug core - 3.5.1.v20091103_r352 + 3.6.0.v20100519 org.eclipse.debug ui - 3.5.2.v20091028_r352-studio + 3.6.1.v20100901_r361 org.eclipse ecf - 3.0.0.v20090831-1906 + 3.1.0.v20100529-0735 org.eclipse.ecf filetransfer - 3.0.0.v20090831-1906 + 4.0.0.v20100529-0735 org.eclipse.ecf identity - 3.0.0.v20090831-1906 + 3.1.0.v20100529-0735 org.eclipse.ecf.provider filetransfer - 3.0.1.v20090831-1906 + 3.1.0.v20100529-0735 + + + org.eclipse.epp.package + java + 1.3.1.20100913-1228 + zip org.eclipse.equinox app - 1.2.1.R35x_v20091203 + 1.3.1.R36x_v20100803 org.eclipse.equinox common - 3.5.1.R35x_v20090807-1100 + 3.6.0.v20100503 org.eclipse.equinox.http jetty - 2.0.0.v20090520-1800 + 2.0.0.v20100503 org.eclipse.equinox.http registry - 1.0.200.v20090520-1800 + 1.1.0.v20100503 org.eclipse.equinox.http servlet - 1.0.200.v20090520-1800 + 1.1.0.v20100503 org.eclipse.equinox.jsp jasper - 1.0.200.v20090520-1800 + 1.0.200.v20100421 org.eclipse.equinox.jsp.jasper registry - 1.0.100.v20090520-1800 + 1.0.200.v20100503 org.eclipse.equinox launcher - 1.0.201.R35x_v20090715 + 1.1.0.v20100507 - org.eclipse.equinox.launcher.carbon - macosx - 1.0.200.v20090520-1835 + org.eclipse.equinox.launcher.cocoa.macosx + x86_64 + 1.1.1.R36x_v20100810 zip @@ -837,173 +838,299 @@ org.eclipse.equinox.p2.artifact repository - 1.0.101.R35x_v20090721 + 1.1.1.R36x_v20100901 + + + org.eclipse.equinox.p2 + console + 1.0.200.v20100601 org.eclipse.equinox.p2 core - 1.0.101.R35x_v20090819 + 2.0.2.R36x_v20100804 + + + org.eclipse.equinox.p2 + director + 2.0.2.R36x_v20100823 + + + org.eclipse.equinox.p2.director + app + 1.0.201.R36x_v20100823 + + + org.eclipse.equinox.p2 + directorywatcher + 1.0.202.R36x_v20100727 + + + org.eclipse.equinox.p2 + discovery + 1.0.0.v20100503 + + + org.eclipse.equinox.p2.discovery + compatibility + 1.0.0.v20100518 org.eclipse.equinox.p2 engine - 1.0.102.R35x_v20091117 + 2.0.0.v20100606 + + + org.eclipse.equinox.p2 + extensionlocation + 1.2.0.v20100518 + + + org.eclipse.equinox.p2 + garbagecollector + 1.0.100.v20100503 org.eclipse.equinox.p2 jarprocessor - 1.0.100.v20090520-1905 + 1.0.200.v20100503a org.eclipse.equinox.p2 metadata - 1.0.101.R35x_v20100112 + 2.0.0.v20100601 + + + org.eclipse.equinox.p2.metadata + generator + 1.0.200.v20100503a org.eclipse.equinox.p2.metadata repository - 1.0.101.R35x_v20090812 + 1.1.0.v20100513 + + + org.eclipse.equinox.p2 + operations + 2.0.0.v20100510 + + + org.eclipse.equinox.p2 + publisher + 1.1.2.v20100824-2220 + + + org.eclipse.equinox.p2 + ql + 2.0.0.v20100503a + + + org.eclipse.equinox.p2.reconciler + dropins + 1.1.0.v20100525 org.eclipse.equinox.p2 repository - 1.0.1.R35x_v20100105 + 2.0.1.R36x_v20100823 + + + org.eclipse.equinox.p2.repository + tools + 2.0.1.R36x_v20100823 + + + org.eclipse.equinox.p2.touchpoint + eclipse + 2.0.2.R36x_v20100823 + + + org.eclipse.equinox.p2.touchpoint + natives + 1.0.200.v20100503a + + + org.eclipse.equinox.p2 + ui + 2.0.0.v20100518 + + + org.eclipse.equinox.p2.ui + discovery + 1.0.0.v20100519 + + + org.eclipse.equinox.p2.ui + sdk + 1.0.100.v20100513 + + + org.eclipse.equinox.p2.ui.sdk + scheduler + 1.0.0.v20100507-1815 + + + org.eclipse.equinox.p2 + updatechecker + 1.1.101.R36x_v20100823 + + + org.eclipse.equinox.p2 + updatesite + 1.0.201.R36x_v20100823 org.eclipse.equinox preferences - 3.2.301.R35x_v20091117 + 3.3.0.v20100503 org.eclipse.equinox registry - 3.4.100.v20090520-1800 + 3.5.0.v20100503 org.eclipse.equinox security - 1.0.100.v20090520-1800 + 1.0.200.v20100503 + + + org.eclipse.equinox + simpleconfigurator + 1.0.200.v20100503 + + + org.eclipse.equinox.simpleconfigurator + manipulator + 2.0.0.v20100503 org.eclipse help - 3.4.1.v20090805_35x + 3.5.0.v20100524 org.eclipse.help appserver - 3.1.400.v20090429_1800 + 3.1.400.v20100427 org.eclipse.help base - 3.4.0.v201002111343 + 3.5.2.v201009090800 org.eclipse.help ui - 3.4.1.v20090819_35x + 3.5.2.r36_v20100702 org.eclipse.help webapp - 3.4.1.v20091009_35x + 3.5.2.r36_r20100816 org.eclipse.jdt core - 3.5.2.v_981_R35x + 3.6.1.v_A68_R36x org.eclipse.jdt.core manipulation - 1.3.0.v20090603 + 1.3.0.v20100520-0800 org.eclipse.jdt debug - 3.5.0.v20090526 + 3.6.1.v20100715_r361 zip org.eclipse.jdt.debug ui - 3.4.1.v20090811_r351-studio + 3.5.0.v20100602-0830 org.eclipse.jdt launching - 3.5.1.v20100108_r352 + 3.5.100.v20100526 org.eclipse.jdt.launching macosx - 3.2.0.v20090527 + 3.2.100.v20100505 org.eclipse.jdt ui - 3.5.2.r352_v20100106-0800-studio + 3.6.1.r361_v20100825-0800 org.eclipse jface - 3.5.2.M20100120-0800 + 3.6.1.M20100825-0800 org.eclipse.jface databinding - 1.3.1.M20090826-0800 + 1.4.0.I20100601-0800 org.eclipse.jface text - 3.5.2.r352_v20091118-0800 + 3.6.1.r361_v20100825-0800 org.eclipse.ltk.core refactoring - 3.5.0.v20090513-2000 + 3.5.100.v20100526-0800 org.eclipse.ltk.ui refactoring - 3.4.101.r352_v20100209 + 3.5.0.v20100526-0800 org.eclipse osgi - 3.5.2.R35x_v20100126 + 3.6.1.R36x_v20100806 org.eclipse.osgi services - 3.2.0.v20090520-1800 + 3.2.100.v20100503 org.eclipse.osgi util - 3.2.0.v20090520-1800 + 3.2.100.v20100503 + + + org.eclipse + platform + 3.6.1.v201009090800 + zip org.eclipse rcp - 3.5.0.v201002111343 + 3.6.0.v201009090800 org.eclipse search - 3.5.1.r351_v20090708-0800-studio + 3.6.0.v20100520-0800 org.eclipse swt - 3.5.2.v3557f + 3.6.1.v3655c - org.eclipse.swt.carbon - macosx - 3.5.2.v3557f + org.eclipse.swt.cocoa.macosx + x86_64 + 3.6.1.v3655c org.eclipse.swt.gtk.linux @@ -1023,82 +1150,82 @@ org.eclipse.team core - 3.5.1.r35x_20100113-0800 + 3.5.100.R36x_v20100825-0800 org.eclipse.team ui - 3.5.0.I20090430-0408-studio + 3.5.101.R36x_v20100825-0800 org.eclipse text - 3.5.0.v20090513-2000 + 3.5.0.v20100601-1300 org.eclipse ui - 3.5.2.M20100120-0800 + 3.6.1.M20100826-1330 org.eclipse.ui - carbon - 4.0.0.I20090525-2000 + cocoa + 1.0.2.M20100825-0800 org.eclipse.ui console - 3.4.0.v20090513 + 3.5.0.v20100526 org.eclipse.ui editors - 3.5.0.v20090527-2000-studio + 3.6.1.r361_v20100825-0800 org.eclipse.ui forms - 3.4.1.v20090714_35x + 3.5.2.r36_v20100702 org.eclipse.ui ide - 3.5.2.M20100113-0800-studio + 3.6.1.M20100825-0800 org.eclipse.ui.ide application - 1.0.101.M20090826-0800-studio + 1.0.201.M20100707-0800 org.eclipse.ui intro - 3.3.2.v20100111_35x + 3.4.0.v20100427 org.eclipse.ui navigator - 3.4.2.M20100120-0800 + 3.5.0.I20100601-0800 org.eclipse.ui.navigator resources - 3.4.1.M20090826-0800-studio + 3.4.201.M20100707-0800 org.eclipse.ui net - 1.2.1.r35x_20090812-1200 + 1.2.100.I20100505-1245 org.eclipse.ui views - 3.4.1.M20090826-0800-studio + 3.5.0.I20100527-0800 org.eclipse.ui.views.properties tabbed - 3.5.0.I20090429-1800 + 3.5.100.I20100509-0800 org.eclipse.ui @@ -1108,7 +1235,7 @@ org.eclipse.ui workbench - 3.5.2.M20100113-0800 + 3.6.1.M20100826-1330 org.eclipse.ui.workbench @@ -1119,37 +1246,37 @@ org.eclipse.ui.workbench texteditor - 3.5.1.r352_v20100105 + 3.6.1.r361_v20100714-0800 org.eclipse.update configurator - 3.3.0.v20090312 + 3.3.100.v20100512 org.eclipse.update core - 3.2.300.v20090525 + 3.2.402.R36x_v20100629 org.eclipse.update scheduler - 3.2.200.v20081127 + 3.2.300.v20100512 org.eclipse.update ui - 3.2.201.R35x_v20090813 + 3.2.300.v20100512 org.mortbay.jetty server - 6.1.15.v200905151201 + 6.1.23.v201004211559 org.mortbay.jetty util - 6.1.15.v200905182336 + 6.1.23.v201004211559 @@ -1636,4 +1763,13 @@ https://repository.apache.org/content/repositories/snapshots/ + + + + studio.repository + Studio Provided Repository + file://${project.basedir} + + +