Bazaar Plugin for Eclipse

Merge lp:~verterok/bzr-eclipse/builds-with-tycho into lp:~verterok/bzr-eclipse/trunk

  1. builds-with-tycho
  2. Merge into trunk
Proposed by Guillermo Gonzalez
Status: Merged
Merged at revision: 223
Proposed branch: lp:~verterok/bzr-eclipse/builds-with-tycho
Merge into: lp:~verterok/bzr-eclipse/trunk
Diff against target: 796 lines (+395/-96)
25 files modified
.bzrignore (+10/-0)
HowToCompileAndRun.txt (+4/-4)
INSTALL (+1/-1)
org.apache.commons.logging/pom.xml (+3/-2)
org.kxml2/pom.xml (+3/-2)
org.vcs.bazaar.eclipse.client/pom.xml (+17/-7)
org.vcs.bazaar.eclipse.core.tests/pom.xml (+49/-28)
org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/AbstractCoreTestCase.java (+1/-0)
org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/TestCaseWithProject.java (+8/-3)
org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/WorkspaceUtil.java (+7/-2)
org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/core/BundledPluginsTest.java (+2/-1)
org.vcs.bazaar.eclipse.core/.settings/org.eclipse.mylar.tasklist.prefs (+0/-4)
org.vcs.bazaar.eclipse.core/pom.xml (+14/-0)
org.vcs.bazaar.eclipse.feature/.project (+23/-17)
org.vcs.bazaar.eclipse.feature/pom.xml (+14/-0)
org.vcs.bazaar.eclipse.site/.project (+23/-0)
org.vcs.bazaar.eclipse.site/pom.xml (+14/-0)
org.vcs.bazaar.eclipse.site/site.xml (+17/-0)
org.vcs.bazaar.eclipse.tests-feature/.project (+6/-0)
org.vcs.bazaar.eclipse.tests-feature/feature.xml (+1/-1)
org.vcs.bazaar.eclipse.tests-feature/pom.xml (+14/-0)
org.vcs.bazaar.eclipse.ui/.settings/org.eclipse.mylar.tasklist.prefs (+0/-4)
org.vcs.bazaar.eclipse.ui/pom.xml (+14/-0)
pom.xml (+146/-17)
redstone.xmlrpc/pom.xml (+4/-3)
To merge this branch: bzr merge lp:~verterok/bzr-eclipse/builds-with-tycho
Reviewer Review Type Date Requested Status
xaav Pending
Review via email: mp+68480@code.launchpad.net

Description of the change

This branch adds a "site" project and changes all the pom.xml and fix some issues with the tests in order to make use of tycho to run tests and build the update-site.

To post a comment you must log in.
Revision history for this message
Guillermo Gonzalez (verterok) wrote :

Hi Geoff,

I requested a review for this, as it changes the dependencies :)
(Let me know if you can't review it)

In order to test it you need to get maven 3.0.x, and run: mvn-3 clean compile integration-test
That should build it and run the unittests in org.vcs.bazaar.eclipse.core.tests.

Cheers,

Revision history for this message
Guillermo Gonzalez (verterok) wrote :

And if you want to check the result of the new build, here is the update site generate by tycho: http://verterok.com.ar/bzr-eclipse/tycho-update-site/

Revision history for this message
xaav (xaav) wrote :

Sorry, I was gone the past few weeks. I'll look into this as soon as I have the time!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2009-05-04 05:13:16 +0000
+++ .bzrignore 2011-07-20 00:07:30 +0000
@@ -9,3 +9,13 @@
9*.jar9*.jar
10org.vcs.bazaar.eclipse.core.tests/bin10org.vcs.bazaar.eclipse.core.tests/bin
11org.vcs.bazaar.eclipse.client/plugins/*11org.vcs.bazaar.eclipse.client/plugins/*
12org.apache.commons.logging/target
13org.kxml2/target
14org.vcs.bazaar.eclipse.client/target
15org.vcs.bazaar.eclipse.core/target
16org.vcs.bazaar.eclipse.core.tests/target
17org.vcs.bazaar.eclipse.feature/target
18org.vcs.bazaar.eclipse.site/target
19org.vcs.bazaar.eclipse.tests-feature/target
20org.vcs.bazaar.eclipse.ui/target
21redstone.xmlrpc/target
1222
=== modified file 'HowToCompileAndRun.txt'
--- HowToCompileAndRun.txt 2009-09-20 06:59:46 +0000
+++ HowToCompileAndRun.txt 2011-07-20 00:07:30 +0000
@@ -1,9 +1,9 @@
1Requirements:1Requirements:
2 * Eclipse SDK >= 3.3 (get it [http://eclipse.org/downloads here])2 * Eclipse SDK >= 3.3 (get it [http://eclipse.org/downloads here])
3 * Java 1.5 (5.0) but should run with 1.6 (get it [http://java.sun.com/javase/downloads/index.jsp here])3 * Java 1.5 (5.0) but should run with 1.6 (get it [http://java.sun.com/javase/downloads/index.jsp here])
4 * bzr-xmloutput >= 0.8.54 * bzr-xmloutput >= 0.8.7
5 * bazaar >= 1.18 recommended5 * bazaar >= 2.x recommended
6 * maven (2.2.0 recommended)6 * maven 3.0.x (a.k.a tycho)
7 7
8Recomended:8Recomended:
9 * ~1 GB of RAM, to comfortably run in debug mode or directly from the source (more on this later)9 * ~1 GB of RAM, to comfortably run in debug mode or directly from the source (more on this later)
@@ -11,7 +11,7 @@
111) Get the source code from https://launchpad.net/bzr-eclipse 111) Get the source code from https://launchpad.net/bzr-eclipse
12 bzr branch lp:bzr-eclipse12 bzr branch lp:bzr-eclipse
1313
14 1.1) run: mvn compile to get bzr-java-lib and it dependencies in place14 1.1) run: 'mvn compile integration-tests' to get bzr-java-lib and it dependencies in place and run the tests.
1515
162) Launch Eclipse162) Launch Eclipse
17 2.1) File--> Import --> "Existing project into workspace"17 2.1) File--> Import --> "Existing project into workspace"
1818
=== modified file 'INSTALL'
--- INSTALL 2009-09-20 06:59:46 +0000
+++ INSTALL 2011-07-20 00:07:30 +0000
@@ -10,7 +10,7 @@
1010
11Dependencies11Dependencies
12------------12------------
13 * bazaar >= 1.18 recommended13 * bazaar >= 2.x recommended
14 * Java SDK/JRE >=1.514 * Java SDK/JRE >=1.5
15 * Eclipse >= 3.315 * Eclipse >= 3.3
1616
1717
=== modified file 'org.apache.commons.logging/pom.xml'
--- org.apache.commons.logging/pom.xml 2009-09-05 15:06:07 +0000
+++ org.apache.commons.logging/pom.xml 2011-07-20 00:07:30 +0000
@@ -2,14 +2,15 @@
2<project>2<project>
3 <modelVersion>4.0.0</modelVersion>3 <modelVersion>4.0.0</modelVersion>
4 <parent>4 <parent>
5 <artifactId>bzr-eclipse</artifactId>
6 <groupId>org.vcs.bazaar.eclipse</groupId>5 <groupId>org.vcs.bazaar.eclipse</groupId>
6 <artifactId>org.vcs.bazaar.eclipse</artifactId>
7 <version>1.1.1-SNAPSHOT</version>7 <version>1.1.1-SNAPSHOT</version>
8 <relativePath>../pom.xml</relativePath>
8 </parent>9 </parent>
9 <groupId>org.apache.commons.logging</groupId>10 <groupId>org.apache.commons.logging</groupId>
10 <artifactId>org.apache.commons.logging</artifactId>11 <artifactId>org.apache.commons.logging</artifactId>
11 <version>1.1.1</version>12 <version>1.1.1</version>
12 <packaging>pom</packaging>13 <packaging>eclipse-plugin</packaging>
13 <dependencies> 14 <dependencies>
14 <dependency>15 <dependency>
15 <groupId>commons-logging</groupId>16 <groupId>commons-logging</groupId>
1617
=== modified file 'org.kxml2/pom.xml'
--- org.kxml2/pom.xml 2009-09-05 15:06:07 +0000
+++ org.kxml2/pom.xml 2011-07-20 00:07:30 +0000
@@ -2,14 +2,15 @@
2<project>2<project>
3 <modelVersion>4.0.0</modelVersion>3 <modelVersion>4.0.0</modelVersion>
4 <parent>4 <parent>
5 <artifactId>bzr-eclipse</artifactId>
6 <groupId>org.vcs.bazaar.eclipse</groupId>5 <groupId>org.vcs.bazaar.eclipse</groupId>
6 <artifactId>org.vcs.bazaar.eclipse</artifactId>
7 <version>1.1.1-SNAPSHOT</version>7 <version>1.1.1-SNAPSHOT</version>
8 <relativePath>../pom.xml</relativePath>
8 </parent>9 </parent>
9 <groupId>org.kxml2</groupId>10 <groupId>org.kxml2</groupId>
10 <artifactId>org.kxml2</artifactId>11 <artifactId>org.kxml2</artifactId>
11 <version>2.3.0</version>12 <version>2.3.0</version>
12 <packaging>pom</packaging>13 <packaging>eclipse-plugin</packaging>
13 <dependencies> 14 <dependencies>
14 <dependency>15 <dependency>
15 <groupId>kxml2</groupId>16 <groupId>kxml2</groupId>
1617
=== modified file 'org.vcs.bazaar.eclipse.client/pom.xml'
--- org.vcs.bazaar.eclipse.client/pom.xml 2009-11-15 05:46:21 +0000
+++ org.vcs.bazaar.eclipse.client/pom.xml 2011-07-20 00:07:30 +0000
@@ -2,14 +2,15 @@
2<project>2<project>
3 <modelVersion>4.0.0</modelVersion>3 <modelVersion>4.0.0</modelVersion>
4 <parent>4 <parent>
5 <artifactId>bzr-eclipse</artifactId>
6 <groupId>org.vcs.bazaar.eclipse</groupId>5 <groupId>org.vcs.bazaar.eclipse</groupId>
6 <artifactId>org.vcs.bazaar.eclipse</artifactId>
7 <version>1.1.1-SNAPSHOT</version>7 <version>1.1.1-SNAPSHOT</version>
8 <relativePath>../pom.xml</relativePath>
8 </parent>9 </parent>
9 <groupId>org.vcs.bazaar.eclipse</groupId>10 <groupId>org.vcs.bazaar.eclipse.client</groupId>
10 <artifactId>org.vcs.bazaar.eclipse.client</artifactId>11 <artifactId>org.vcs.bazaar.eclipse.client</artifactId>
11 <version>0.5.3.qualifier</version>12 <version>0.5.3</version>
12 <packaging>pom</packaging>13 <packaging>eclipse-plugin</packaging>
13 <dependencies> 14 <dependencies>
14 <dependency>15 <dependency>
15 <groupId>org.vcs.bazaar.client</groupId>16 <groupId>org.vcs.bazaar.client</groupId>
@@ -28,13 +29,22 @@
28 <id>copy-dependencies</id>29 <id>copy-dependencies</id>
29 <phase>compile</phase>30 <phase>compile</phase>
30 <goals>31 <goals>
31 <goal>copy-dependencies</goal>32 <goal>copy</goal>
32 </goals>33 </goals>
33 <configuration>34 <configuration>
35 <artifactItems>
36 <artifactItem>
37 <groupId>org.vcs.bazaar.client</groupId>
38 <artifactId>bzr-java-lib</artifactId>
39 <type>jar</type>
40 <overWrite>false</overWrite>
41 </artifactItem>
42 </artifactItems>
34 <excludeArtifactIds>kxml2-min,xmlrpc-client,commons-logging</excludeArtifactIds>43 <excludeArtifactIds>kxml2-min,xmlrpc-client,commons-logging</excludeArtifactIds>
35 <overWriteReleases>true</overWriteReleases>44 <overWriteReleases>false</overWriteReleases>
36 <overWriteSnapshots>true</overWriteSnapshots>45 <overWriteSnapshots>false</overWriteSnapshots>
37 <overWriteIfNewer>true</overWriteIfNewer>46 <overWriteIfNewer>true</overWriteIfNewer>
47 <excludeTransitive>true</excludeTransitive>
38 <outputDirectory>${basedir}</outputDirectory>48 <outputDirectory>${basedir}</outputDirectory>
39 </configuration>49 </configuration>
40 </execution>50 </execution>
4151
=== modified file 'org.vcs.bazaar.eclipse.core.tests/pom.xml'
--- org.vcs.bazaar.eclipse.core.tests/pom.xml 2009-11-15 05:46:21 +0000
+++ org.vcs.bazaar.eclipse.core.tests/pom.xml 2011-07-20 00:07:30 +0000
@@ -2,15 +2,16 @@
2<project>2<project>
3 <modelVersion>4.0.0</modelVersion>3 <modelVersion>4.0.0</modelVersion>
4 <parent>4 <parent>
5 <artifactId>bzr-eclipse</artifactId>
6 <groupId>org.vcs.bazaar.eclipse</groupId>5 <groupId>org.vcs.bazaar.eclipse</groupId>
6 <artifactId>org.vcs.bazaar.eclipse</artifactId>
7 <version>1.1.1-SNAPSHOT</version>7 <version>1.1.1-SNAPSHOT</version>
8 <relativePath>../pom.xml</relativePath>
8 </parent>9 </parent>
9 <groupId>org.vcs.bazaar.eclipse</groupId>10 <groupId>org.vcs.bazaar.eclipse.core.test</groupId>
10 <artifactId>org.vcs.bazaar.eclipse.core.tests</artifactId>11 <artifactId>org.vcs.bazaar.eclipse.core.test</artifactId>
11 <version>1.1.1.qualifier</version>12 <version>${bzr-eclipse-version}</version>
12 <packaging>pom</packaging>13 <packaging>eclipse-test-plugin</packaging>
13 <dependencies> 14 <dependencies>
14 <dependency>15 <dependency>
15 <groupId>org.vcs.bazaar.client</groupId>16 <groupId>org.vcs.bazaar.client</groupId>
16 <artifactId>bzr-java-lib</artifactId>17 <artifactId>bzr-java-lib</artifactId>
@@ -19,28 +20,48 @@
19 <scope>compile</scope>20 <scope>compile</scope>
20 </dependency>21 </dependency>
21 </dependencies>22 </dependencies>
23
22 <build>24 <build>
23 <plugins>25 <plugins>
24 <plugin>26 <plugin>
25 <groupId>org.apache.maven.plugins</groupId>27 <groupId>org.apache.maven.plugins</groupId>
26 <artifactId>maven-dependency-plugin</artifactId>28 <artifactId>maven-dependency-plugin</artifactId>
27 <executions>29 <executions>
28 <execution>30 <execution>
29 <id>copy-dependencies</id>31 <id>copy-dependencies</id>
30 <phase>compile</phase>32 <phase>generate-sources</phase>
31 <goals>33 <goals>
32 <goal>copy-dependencies</goal>34 <goal>copy</goal>
33 </goals>35 </goals>
34 <configuration>36 <configuration>
35 <excludeArtifactIds>kxml2-min,xmlrpc,xmlrpc-client,commons-logging</excludeArtifactIds>37 <artifactItems>
36 <overWriteReleases>true</overWriteReleases>38 <artifactItem>
37 <overWriteSnapshots>true</overWriteSnapshots>39 <groupId>org.vcs.bazaar.client</groupId>
38 <overWriteIfNewer>true</overWriteIfNewer>40 <artifactId>bzr-java-lib</artifactId>
39 <outputDirectory>${basedir}</outputDirectory>41 <classifier>tests</classifier>
40 </configuration>42 <type>jar</type>
41 </execution>43 <overWrite>false</overWrite>
42 </executions>44 </artifactItem>
43 </plugin>45 </artifactItems>
44 </plugins>46 <excludeArtifactIds>kxml2-min,xmlrpc-client,commons-logging</excludeArtifactIds>
47 <overWriteReleases>false</overWriteReleases>
48 <overWriteSnapshots>false</overWriteSnapshots>
49 <overWriteIfNewer>true</overWriteIfNewer>
50 <excludeTransitive>true</excludeTransitive>
51 <outputDirectory>${basedir}</outputDirectory>
52 </configuration>
53 </execution>
54 </executions>
55 </plugin>
56 <plugin>
57 <groupId>org.sonatype.tycho</groupId>
58 <artifactId>maven-osgi-test-plugin</artifactId>
59 <configuration>
60 <explodedBundles>
61 <bundle>org.vcs.bazaar.eclipse.client</bundle>
62 </explodedBundles>
63 </configuration>
64 </plugin>
65 </plugins>
45 </build>66 </build>
46</project>67</project>
4768
=== modified file 'org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/AbstractCoreTestCase.java'
--- org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/AbstractCoreTestCase.java 2009-09-20 06:55:23 +0000
+++ org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/AbstractCoreTestCase.java 2011-07-20 00:07:30 +0000
@@ -22,6 +22,7 @@
22 @BeforeClass22 @BeforeClass
23 public static void initialize() {23 public static void initialize() {
24 final Preferences prefs = EclipseBazaarCore.getDefault().getPluginPreferences();24 final Preferences prefs = EclipseBazaarCore.getDefault().getPluginPreferences();
25 prefs.setValue(IBazaarCoreConstants.USE_BUNDLED_PLUGINS, true);
25 if(!EclipseBazaarCore.getDefault().isClientAvailable()) {26 if(!EclipseBazaarCore.getDefault().isClientAvailable()) {
26 BazaarUtilities.configureBazaarClient(AbstractCoreTestCase.class, "/tests.properties");27 BazaarUtilities.configureBazaarClient(AbstractCoreTestCase.class, "/tests.properties");
27 final BazaarClientPreferences clientPrefs = BazaarClientPreferences.getInstance();28 final BazaarClientPreferences clientPrefs = BazaarClientPreferences.getInstance();
2829
=== modified file 'org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/TestCaseWithProject.java'
--- org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/TestCaseWithProject.java 2009-01-02 23:14:54 +0000
+++ org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/TestCaseWithProject.java 2011-07-20 00:07:30 +0000
@@ -21,8 +21,9 @@
21 * @author Guillermo Gonzalez <guillo.gonzo@gmail.com>21 * @author Guillermo Gonzalez <guillo.gonzo@gmail.com>
22 *22 *
23 */23 */
24public class TestCaseWithProject extends AbstractCoreTestCase {24public abstract class TestCaseWithProject extends AbstractCoreTestCase {
2525
26 private File testRoot;
26 private IProject project;27 private IProject project;
27 private ExpectedWorkingTree wt;28 private ExpectedWorkingTree wt;
2829
@@ -40,10 +41,13 @@
40 return wt;41 return wt;
41 }42 }
42 43
43
44 @Before44 @Before
45 public void setUp() throws Exception {45 public void setUp() throws Exception {
46 project = WorkspaceUtil.createProject(this.getClass().getName());46 testRoot = File.createTempFile("bzr-eclipse", "test");
47 testRoot.delete();
48 testRoot.mkdir();
49 project = WorkspaceUtil.createProject(testRoot, this.getClass().getName());
50 System.out.println();
47 wt = createWorkingTree(project.getLocation());51 wt = createWorkingTree(project.getLocation());
48 project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());52 project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
49 BazaarTeamProvider.map(project, BazaarTeamProvider.ID);53 BazaarTeamProvider.map(project, BazaarTeamProvider.ID);
@@ -53,6 +57,7 @@
53 public void tearDown() throws Exception {57 public void tearDown() throws Exception {
54 if(project != null)58 if(project != null)
55 project.delete(true, true, new NullProgressMonitor());59 project.delete(true, true, new NullProgressMonitor());
60 testRoot.delete();
56 }61 }
57 62
58 /**63 /**
5964
=== modified file 'org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/WorkspaceUtil.java'
--- org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/WorkspaceUtil.java 2008-11-08 14:12:28 +0000
+++ org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/WorkspaceUtil.java 2011-07-20 00:07:30 +0000
@@ -1,23 +1,28 @@
1package org.vcs.bazaar.eclipse;1package org.vcs.bazaar.eclipse;
22
3import java.io.File;
3import java.io.IOException;4import java.io.IOException;
45
5import org.eclipse.core.resources.IProject;6import org.eclipse.core.resources.IProject;
7import org.eclipse.core.resources.IProjectDescription;
6import org.eclipse.core.resources.IWorkspaceRoot;8import org.eclipse.core.resources.IWorkspaceRoot;
7import org.eclipse.core.resources.ResourcesPlugin;9import org.eclipse.core.resources.ResourcesPlugin;
8import org.eclipse.core.runtime.CoreException;10import org.eclipse.core.runtime.CoreException;
9import org.eclipse.core.runtime.NullProgressMonitor;11import org.eclipse.core.runtime.NullProgressMonitor;
12import org.eclipse.core.runtime.Path;
10import org.vcs.bazaar.client.testUtils.ExpectedWorkingTree;13import org.vcs.bazaar.client.testUtils.ExpectedWorkingTree;
1114
12public class WorkspaceUtil {15public class WorkspaceUtil {
1316
14 public static IProject createProject(String name) throws CoreException {17 public static IProject createProject(File baseDir, String name) throws CoreException {
15 IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();18 IWorkspaceRoot workspaceRoot = ResourcesPlugin.getWorkspace().getRoot();
16 IProject project = workspaceRoot.getProject(name);19 IProject project = workspaceRoot.getProject(name);
17 if(project.exists()) {20 if(project.exists()) {
18 project.delete(true, new NullProgressMonitor());21 project.delete(true, new NullProgressMonitor());
19 }22 }
20 project.create(null);23 IProjectDescription desc = ResourcesPlugin.getWorkspace().newProjectDescription(name);
24 desc.setLocation(new Path(baseDir.getAbsolutePath()));
25 project.create(desc, new NullProgressMonitor());
21 project.open(null);26 project.open(null);
22 return project;27 return project;
23 }28 }
2429
=== modified file 'org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/core/BundledPluginsTest.java'
--- org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/core/BundledPluginsTest.java 2009-09-20 06:55:23 +0000
+++ org.vcs.bazaar.eclipse.core.tests/src/org/vcs/bazaar/eclipse/core/BundledPluginsTest.java 2011-07-20 00:07:30 +0000
@@ -25,7 +25,8 @@
25 IBazaarClient client = this.getClient();25 IBazaarClient client = this.getClient();
26 for(IPlugin plugin: client.plugins()) {26 for(IPlugin plugin: client.plugins()) {
27 if(plugin.getName().equals("xmloutput")) {27 if(plugin.getName().equals("xmloutput")) {
28 Assert.assertTrue(plugin.getPath().contains("org.vcs.bazaar.eclipse.client/plugins"));28 Assert.assertTrue(plugin.getPath() + " doesn't contains org.vcs.bazaar.eclipse.client/plugins",
29 plugin.getPath().matches(".*/org.vcs.bazaar.eclipse.client.*/plugins/xmloutput"));
29 }30 }
30 }31 }
31 }32 }
3233
=== removed file 'org.vcs.bazaar.eclipse.core/.settings/org.eclipse.mylar.tasklist.prefs'
--- org.vcs.bazaar.eclipse.core/.settings/org.eclipse.mylar.tasklist.prefs 2007-03-14 12:15:50 +0000
+++ org.vcs.bazaar.eclipse.core/.settings/org.eclipse.mylar.tasklist.prefs 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1#Wed Mar 14 08:28:52 ART 2007
2eclipse.preferences.version=1
3project.repository.kind=trac
4project.repository.url=http\://trac.steppenwolf.selfip.net/BazaarEclipse
50
=== added file 'org.vcs.bazaar.eclipse.core/pom.xml'
--- org.vcs.bazaar.eclipse.core/pom.xml 1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.core/pom.xml 2011-07-20 00:07:30 +0000
@@ -0,0 +1,14 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<project>
3 <modelVersion>4.0.0</modelVersion>
4 <parent>
5 <groupId>org.vcs.bazaar.eclipse</groupId>
6 <artifactId>org.vcs.bazaar.eclipse</artifactId>
7 <version>1.1.1-SNAPSHOT</version>
8 <relativePath>../pom.xml</relativePath>
9 </parent>
10 <groupId>org.vcs.bazaar.eclipse.core</groupId>
11 <artifactId>org.vcs.bazaar.eclipse.core</artifactId>
12 <version>${bzr-eclipse-version}</version>
13 <packaging>eclipse-plugin</packaging>
14</project>
015
=== modified file 'org.vcs.bazaar.eclipse.feature/.project'
--- org.vcs.bazaar.eclipse.feature/.project 2008-04-28 03:16:18 +0000
+++ org.vcs.bazaar.eclipse.feature/.project 2011-07-20 00:07:30 +0000
@@ -1,17 +1,23 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<projectDescription>2<projectDescription>
3 <name>org.vcs.bazaar.eclipse.feature</name>3 <name>org.vcs.bazaar.eclipse.feature</name>
4 <comment></comment>4 <comment></comment>
5 <projects>5 <projects>
6 </projects>6 </projects>
7 <buildSpec>7 <buildSpec>
8 <buildCommand>8 <buildCommand>
9 <name>org.eclipse.pde.FeatureBuilder</name>9 <name>org.eclipse.jdt.core.javabuilder</name>
10 <arguments>10 <arguments>
11 </arguments>11 </arguments>
12 </buildCommand>12 </buildCommand>
13 </buildSpec>13 <buildCommand>
14 <natures>14 <name>org.eclipse.pde.FeatureBuilder</name>
15 <nature>org.eclipse.pde.FeatureNature</nature>15 <arguments>
16 </natures>16 </arguments>
17</projectDescription>17 </buildCommand>
18 </buildSpec>
19 <natures>
20 <nature>org.eclipse.jdt.core.javanature</nature>
21 <nature>org.eclipse.pde.FeatureNature</nature>
22 </natures>
23</projectDescription>
1824
=== added file 'org.vcs.bazaar.eclipse.feature/pom.xml'
--- org.vcs.bazaar.eclipse.feature/pom.xml 1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.feature/pom.xml 2011-07-20 00:07:30 +0000
@@ -0,0 +1,14 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<project>
3 <modelVersion>4.0.0</modelVersion>
4 <parent>
5 <groupId>org.vcs.bazaar.eclipse</groupId>
6 <artifactId>org.vcs.bazaar.eclipse</artifactId>
7 <version>1.1.1-SNAPSHOT</version>
8 <relativePath>../pom.xml</relativePath>
9 </parent>
10 <groupId>org.vcs.bazaar.eclipse.feature</groupId>
11 <artifactId>org.vcs.bazaar.eclipse.feature</artifactId>
12 <version>${bzr-eclipse-version}</version>
13 <packaging>eclipse-feature</packaging>
14</project>
015
=== added directory 'org.vcs.bazaar.eclipse.site'
=== added file 'org.vcs.bazaar.eclipse.site/.project'
--- org.vcs.bazaar.eclipse.site/.project 1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.site/.project 2011-07-20 00:07:30 +0000
@@ -0,0 +1,23 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<projectDescription>
3 <name>org.vcs.bazaar.eclipse.site</name>
4 <comment></comment>
5 <projects>
6 </projects>
7 <buildSpec>
8 <buildCommand>
9 <name>org.eclipse.jdt.core.javabuilder</name>
10 <arguments>
11 </arguments>
12 </buildCommand>
13 <buildCommand>
14 <name>org.eclipse.pde.UpdateSiteBuilder</name>
15 <arguments>
16 </arguments>
17 </buildCommand>
18 </buildSpec>
19 <natures>
20 <nature>org.eclipse.jdt.core.javanature</nature>
21 <nature>org.eclipse.pde.UpdateSiteNature</nature>
22 </natures>
23</projectDescription>
024
=== added file 'org.vcs.bazaar.eclipse.site/pom.xml'
--- org.vcs.bazaar.eclipse.site/pom.xml 1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.site/pom.xml 2011-07-20 00:07:30 +0000
@@ -0,0 +1,14 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<project>
3 <modelVersion>4.0.0</modelVersion>
4 <parent>
5 <groupId>org.vcs.bazaar.eclipse</groupId>
6 <artifactId>org.vcs.bazaar.eclipse</artifactId>
7 <version>1.1.1-SNAPSHOT</version>
8 <relativePath>../pom.xml</relativePath>
9 </parent>
10 <groupId>org.vcs.bazaar.eclipse.site</groupId>
11 <artifactId>org.vcs.bazaar.eclipse.site</artifactId>
12 <version>${bzr-eclipse-version}</version>
13 <packaging>eclipse-update-site</packaging>
14</project>
015
=== added file 'org.vcs.bazaar.eclipse.site/site.xml'
--- org.vcs.bazaar.eclipse.site/site.xml 1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.site/site.xml 2011-07-20 00:07:30 +0000
@@ -0,0 +1,17 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<site>
3 <description url="http://verterok.com.ar/bzr-eclipse/update-site/">
4 Update site for the Eclipse plugin for Bazaar
5 </description>
6 <feature url="features/org.vcs.bazaar.eclipse.feature_1.1.1.qualifier.jar" id="org.vcs.bazaar.eclipse.feature" version="1.1.1.qualifier">
7 <category name="bzr-eclipse (dev snapshot)"/>
8 </feature>
9 <!--feature url="features/org.vcs.bazaar.eclipse.tests-feature_1.1.1.qualifier.jar" id="org.vcs.bazaar.eclipse.tests-feature" version="1.1.1.qualifier">
10 <category name="bzr-eclipse (dev snapshot)"/>
11 </feature-->
12 <category-def name="bzr-eclipse (dev snapshot)" label="bzr-eclipse (Eclipse-3.3 dev snapshot)">
13 <description>
14 Here you can find snapshots of the current development trunk.
15 </description>
16 </category-def>
17</site>
018
=== modified file 'org.vcs.bazaar.eclipse.tests-feature/.project'
--- org.vcs.bazaar.eclipse.tests-feature/.project 2008-10-26 21:07:09 +0000
+++ org.vcs.bazaar.eclipse.tests-feature/.project 2011-07-20 00:07:30 +0000
@@ -6,12 +6,18 @@
6 </projects>6 </projects>
7 <buildSpec>7 <buildSpec>
8 <buildCommand>8 <buildCommand>
9 <name>org.eclipse.jdt.core.javabuilder</name>
10 <arguments>
11 </arguments>
12 </buildCommand>
13 <buildCommand>
9 <name>org.eclipse.pde.FeatureBuilder</name>14 <name>org.eclipse.pde.FeatureBuilder</name>
10 <arguments>15 <arguments>
11 </arguments>16 </arguments>
12 </buildCommand>17 </buildCommand>
13 </buildSpec>18 </buildSpec>
14 <natures>19 <natures>
20 <nature>org.eclipse.jdt.core.javanature</nature>
15 <nature>org.eclipse.pde.FeatureNature</nature>21 <nature>org.eclipse.pde.FeatureNature</nature>
16 </natures>22 </natures>
17</projectDescription>23</projectDescription>
1824
=== modified file 'org.vcs.bazaar.eclipse.tests-feature/feature.xml'
--- org.vcs.bazaar.eclipse.tests-feature/feature.xml 2009-01-17 22:56:14 +0000
+++ org.vcs.bazaar.eclipse.tests-feature/feature.xml 2011-07-20 00:07:30 +0000
@@ -39,7 +39,7 @@
39 </requires>39 </requires>
4040
41 <plugin41 <plugin
42 id="org.vcs.bazaar.eclipse.core.test"42 id="org.vcs.bazaar.eclipse.core.tests"
43 download-size="0"43 download-size="0"
44 install-size="0"44 install-size="0"
45 version="0.0.0"45 version="0.0.0"
4646
=== added file 'org.vcs.bazaar.eclipse.tests-feature/pom.xml'
--- org.vcs.bazaar.eclipse.tests-feature/pom.xml 1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.tests-feature/pom.xml 2011-07-20 00:07:30 +0000
@@ -0,0 +1,14 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<project>
3 <modelVersion>4.0.0</modelVersion>
4 <parent>
5 <groupId>org.vcs.bazaar.eclipse</groupId>
6 <artifactId>org.vcs.bazaar.eclipse</artifactId>
7 <version>${currentVersion}</version>
8 <relativePath>../pom.xml</relativePath>
9 </parent>
10 <groupId>org.vcs.bazaar.eclipse.tests-feature</groupId>
11 <artifactId>org.vcs.bazaar.eclipse.tests-feature</artifactId>
12 <version>1.1.1-SNAPSHOT</version>
13 <packaging>eclipse-test-feature</packaging>
14</project>
015
=== removed file 'org.vcs.bazaar.eclipse.ui/.settings/org.eclipse.mylar.tasklist.prefs'
--- org.vcs.bazaar.eclipse.ui/.settings/org.eclipse.mylar.tasklist.prefs 2007-03-14 12:15:50 +0000
+++ org.vcs.bazaar.eclipse.ui/.settings/org.eclipse.mylar.tasklist.prefs 1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
1#Wed Mar 14 09:01:13 ART 2007
2eclipse.preferences.version=1
3project.repository.kind=trac
4project.repository.url=http\://trac.steppenwolf.selfip.net/BazaarEclipse
50
=== added file 'org.vcs.bazaar.eclipse.ui/pom.xml'
--- org.vcs.bazaar.eclipse.ui/pom.xml 1970-01-01 00:00:00 +0000
+++ org.vcs.bazaar.eclipse.ui/pom.xml 2011-07-20 00:07:30 +0000
@@ -0,0 +1,14 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<project>
3 <modelVersion>4.0.0</modelVersion>
4 <parent>
5 <groupId>org.vcs.bazaar.eclipse</groupId>
6 <artifactId>org.vcs.bazaar.eclipse</artifactId>
7 <version>1.1.1-SNAPSHOT</version>
8 <relativePath>../pom.xml</relativePath>
9 </parent>
10 <groupId>org.vcs.bazaar.eclipse.ui</groupId>
11 <artifactId>org.vcs.bazaar.eclipse.ui</artifactId>
12 <version>${bzr-eclipse-version}</version>
13 <packaging>eclipse-plugin</packaging>
14</project>
015
=== modified file 'pom.xml'
--- pom.xml 2009-09-05 15:06:07 +0000
+++ pom.xml 2011-07-20 00:07:30 +0000
@@ -1,29 +1,158 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<project>2<project>
3 <modelVersion>4.0.0</modelVersion>3 <modelVersion>4.0.0</modelVersion>
4 <prerequisites>
5 <maven>3.0</maven>
6 </prerequisites>
4 <groupId>org.vcs.bazaar.eclipse</groupId>7 <groupId>org.vcs.bazaar.eclipse</groupId>
5 <artifactId>bzr-eclipse</artifactId>8 <artifactId>org.vcs.bazaar.eclipse</artifactId>
6 <version>1.1.1-SNAPSHOT</version>9 <version>1.1.1-SNAPSHOT</version>
7 <packaging>pom</packaging>10 <packaging>pom</packaging>
8 <scm>11 <scm>
9 <connection>scm:bazaar:lp:bzr-eclipse</connection>12 <connection>scm:bazaar:lp:bzr-eclipse</connection>
10 <url>http://code.launchpad.net/bzr-eclipse</url>13 <url>http://code.launchpad.net/bzr-eclipse</url>
11 </scm>14 </scm>
12 <issueManagement>15 <issueManagement>
13 <system>Launchpad</system>16 <system>Launchpad</system>
14 <url>http://bugs.launchpad.net/bzr-eclipse</url>17 <url>http://bugs.launchpad.net/bzr-eclipse</url>
15 </issueManagement>18 </issueManagement>
16 <repositories>19 <properties>
17 <repository>20 <bzr-eclipse-version>1.1.1-SNAPSHOT</bzr-eclipse-version>
18 <id>verterok-mvn-repo</id>21 <tycho-version>0.10.0</tycho-version>
19 <url>http://verterok.com.ar/maven-repo/</url>22 <platform-version-name>helios</platform-version-name>
20 </repository>23 <eclipse-site>http://download.eclipse.org/releases/${platform-version-name}</eclipse-site>
21 </repositories>24 <wikitext-site>http://download.eclipse.org/tools/mylyn/update/weekly</wikitext-site>
25 <swtbot-site>http://download.eclipse.org/technology/swtbot/${platform-version-name}/dev-build/update-site</swtbot-site>
26 <orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20110523182458/repository</orbit-site>
27 </properties>
28
22 <modules>29 <modules>
23 <module>org.vcs.bazaar.eclipse.client</module>
24 <module>org.vcs.bazaar.eclipse.core.tests</module>
25 <module>org.apache.commons.logging</module>30 <module>org.apache.commons.logging</module>
26 <module>org.kxml2</module>31 <module>org.kxml2</module>
27 <module>redstone.xmlrpc</module>32 <module>redstone.xmlrpc</module>
33 <module>org.vcs.bazaar.eclipse.client</module>
34 <module>org.vcs.bazaar.eclipse.core</module>
35 <module>org.vcs.bazaar.eclipse.core.tests</module>
36 <module>org.vcs.bazaar.eclipse.feature</module>
37 <!--module>org.vcs.bazaar.eclipse.tests-feature</module-->
38 <module>org.vcs.bazaar.eclipse.ui</module>
39 <module>org.vcs.bazaar.eclipse.site</module>
28 </modules>40 </modules>
41
42 <repositories>
43 <repository>
44 <id>verterok-mvn-repo</id>
45 <url>http://verterok.com.ar/maven-repo/</url>
46 </repository>
47 <repository>
48 <id>helios</id>
49 <layout>p2</layout>
50 <url>${eclipse-site}</url>
51 </repository>
52 <!--repository>
53 <id>swtbot</id>
54 <layout>p2</layout>
55 <url>${swtbot-site}</url>
56 </repository>
57 <repository>
58 <id>wikitext</id>
59 <layout>p2</layout>
60 <url>${wikitext-site}</url>
61 </repository-->
62 <repository>
63 <id>orbit</id>
64 <layout>p2</layout>
65 <url>${orbit-site}</url>
66 </repository>
67 </repositories>
68
69 <!--build>
70 <plugins>
71 <plugin>
72 <groupId>org.apache.maven.plugins</groupId>
73 <artifactId>maven-resources-plugin</artifactId>
74 <version>2.4.1</version>
75 <configuration>
76 <encoding>UTF-8</encoding>
77 </configuration>
78 </plugin>
79 < !-plugin>
80 <groupId>org.sonatype.tycho</groupId>
81 <artifactId>maven-osgi-compiler-plugin</artifactId>
82 <version>${tycho-version}</version>
83 <configuration>
84 <encoding>UTF-8</encoding>
85 </configuration>
86 </plugin->
87 <plugin>
88 <groupId>org.sonatype.tycho</groupId>
89 <artifactId>maven-osgi-lifecycle-plugin</artifactId>
90 <version>1.0-SNAPSHOT</version>
91 <inherited>true</inherited>
92 <extensions>true</extensions>
93 </plugin>
94 </plugins>
95 <pluginManagement>
96 <plugins>
97 <plugin>
98 <groupId>org.sonatype.tycho</groupId>
99 <artifactId>maven-osgi-packaging-plugin</artifactId>
100 <executions>
101 <execution>
102 <id>timestamp</id>
103 <phase>validate</phase>
104 <goals>
105 <goal>timestamp</goal>
106 </goals>
107 </execution>
108 </executions>
109 </plugin>
110 </plugins-->
111 <build>
112 <plugins>
113 <plugin>
114 <groupId>org.sonatype.tycho</groupId>
115 <artifactId>tycho-maven-plugin</artifactId>
116 <version>${tycho-version}</version>
117 <extensions>true</extensions>
118 </plugin>
119 <plugin>
120 <groupId>org.sonatype.tycho</groupId>
121 <artifactId>target-platform-configuration</artifactId>
122 <version>${tycho-version}</version>
123 <configuration>
124 <resolver>p2</resolver>
125 </configuration>
126 </plugin>
127 </plugins>
128 <pluginManagement>
129 <plugins>
130 <plugin>
131 <groupId>org.sonatype.tycho</groupId>
132 <artifactId>maven-osgi-compiler-plugin</artifactId>
133 <version>${tycho-version}</version>
134 <configuration>
135 <encoding>UTF-8</encoding>
136 </configuration>
137 </plugin>
138 <plugin>
139 <!-- TODO remove workaround when
140 https://issues.sonatype.org/browse/TYCHO-473
141 is fixed -->
142 <groupId>org.sonatype.tycho</groupId>
143 <artifactId>maven-osgi-source-plugin</artifactId>
144 <version>${tycho-version}</version>
145 <executions>
146 <execution>
147 <id>attach-source</id>
148 <phase>process-classes</phase>
149 <goals>
150 <goal>plugin-source</goal>
151 </goals>
152 </execution>
153 </executions>
154 </plugin>
155 </plugins>
156 </pluginManagement>
157 </build>
29</project>158</project>
30159
=== modified file 'redstone.xmlrpc/pom.xml'
--- redstone.xmlrpc/pom.xml 2009-11-15 05:46:21 +0000
+++ redstone.xmlrpc/pom.xml 2011-07-20 00:07:30 +0000
@@ -2,14 +2,15 @@
2<project>2<project>
3 <modelVersion>4.0.0</modelVersion>3 <modelVersion>4.0.0</modelVersion>
4 <parent>4 <parent>
5 <artifactId>bzr-eclipse</artifactId>
6 <groupId>org.vcs.bazaar.eclipse</groupId>5 <groupId>org.vcs.bazaar.eclipse</groupId>
6 <artifactId>org.vcs.bazaar.eclipse</artifactId>
7 <version>1.1.1-SNAPSHOT</version>7 <version>1.1.1-SNAPSHOT</version>
8 <relativePath>../pom.xml</relativePath>
8 </parent>9 </parent>
9 <groupId>redstone.xmlrpc</groupId>10 <groupId>redstone.xmlrpc</groupId>
10 <artifactId>redstone.xmlrpc</artifactId>11 <artifactId>redstone.xmlrpc</artifactId>
11 <version>1.1.1-r35</version>12 <version>1.1.1.35</version>
12 <packaging>pom</packaging>13 <packaging>eclipse-plugin</packaging>
13 <dependencies> 14 <dependencies>
14 <dependency>15 <dependency>
15 <groupId>redstone</groupId>16 <groupId>redstone</groupId>

Subscribers

People subscribed via source and target branches