Bazaar Plugin for Eclipse

Merge lp:~alex-idereal/bzr-eclipse/1.2.0-patches into lp:bzr-eclipse

  1. 1.2.0-patches
  2. Merge into trunk
Proposed by Alexander Taler
Status: Merged
Approved by: Alexander Taler
Approved revision: 272
Merged at revision: 278
Proposed branch: lp:~alex-idereal/bzr-eclipse/1.2.0-patches
Merge into: lp:bzr-eclipse
Diff against target: 103 lines (+47/-7)
5 files modified
org.vcs.bazaar.eclipse.client/.classpath (+2/-2)
org.vcs.bazaar.eclipse.core.tests/.classpath (+2/-2)
org.vcs.bazaar.eclipse.core/.classpath (+1/-1)
org.vcs.bazaar.eclipse.ui/.classpath (+2/-2)
org.vcs.bazaar.eclipse.ui/pom.xml (+40/-0)
To merge this branch: bzr merge lp:~alex-idereal/bzr-eclipse/1.2.0-patches
Reviewer Review Type Date Requested Status
Alexander Taler Approve
Review via email: mp+164605@code.launchpad.net

Commit message

Build System: Update for 1.2.0, and fix dependencies in UI

Description of the change

Build System: Update for 1.2.0, and fix dependencies in UI

To post a comment you must log in.
Revision history for this message
Alexander Taler (alex-idereal) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'org.vcs.bazaar.eclipse.client/.classpath'
--- org.vcs.bazaar.eclipse.client/.classpath 2011-07-30 22:37:22 +0000
+++ org.vcs.bazaar.eclipse.client/.classpath 2013-05-19 02:13:28 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<classpath>2<classpath>
3 <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>3 <classpathentry exported="true" kind="lib" path="bzr-java-lib-1.2.0-SNAPSHOT.jar"/>
4 <classpathentry exported="true" kind="lib" path="bzr-java-lib-0.5.3-SNAPSHOT.jar"/>4 <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5 <classpathentry kind="output" path="bin"/>5 <classpathentry kind="output" path="bin"/>
6</classpath>6</classpath>
77
=== modified file 'org.vcs.bazaar.eclipse.core.tests/.classpath'
--- org.vcs.bazaar.eclipse.core.tests/.classpath 2011-07-30 00:28:03 +0000
+++ org.vcs.bazaar.eclipse.core.tests/.classpath 2013-05-19 02:13:28 +0000
@@ -1,7 +1,7 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<classpath>2<classpath>
3 <classpathentry excluding="org/vcs/bazaar/eclipse/core/status/SynchronizerSyncInfoCache.java" kind="src" path="src"/>3 <classpathentry kind="src" path="src"/>
4 <classpathentry exported="true" kind="lib" path="bzr-java-lib-0.5.3-SNAPSHOT-tests.jar"/>4 <classpathentry exported="true" kind="lib" path="bzr-java-lib-1.2.0-SNAPSHOT-tests.jar"/>
5 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>5 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
6 <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>6 <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
7 <classpathentry kind="output" path="bin"/>7 <classpathentry kind="output" path="bin"/>
88
=== modified file 'org.vcs.bazaar.eclipse.core/.classpath'
--- org.vcs.bazaar.eclipse.core/.classpath 2011-07-30 00:28:03 +0000
+++ org.vcs.bazaar.eclipse.core/.classpath 2013-05-19 02:13:28 +0000
@@ -1,6 +1,6 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<classpath>2<classpath>
3 <classpathentry excluding="org/vcs/bazaar/eclipse/core/status/SynchronizerSyncInfoCache.java" kind="src" path="src"/>3 <classpathentry kind="src" path="src"/>
4 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>4 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
5 <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>5 <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
6 <classpathentry kind="output" path="bin"/>6 <classpathentry kind="output" path="bin"/>
77
=== modified file 'org.vcs.bazaar.eclipse.ui/.classpath'
--- org.vcs.bazaar.eclipse.ui/.classpath 2013-03-24 21:26:41 +0000
+++ org.vcs.bazaar.eclipse.ui/.classpath 2013-05-19 02:13:28 +0000
@@ -1,9 +1,9 @@
1<?xml version="1.0" encoding="UTF-8"?>1<?xml version="1.0" encoding="UTF-8"?>
2<classpath>2<classpath>
3 <classpathentry excluding="org/vcs/bazaar/eclipse/ui/actions/BzrAction_branch_project_mapping.java|org/vcs/bazaar/eclipse/ui/dialogs/CopyOfRevertDialog.java|org/vcs/bazaar/eclipse/ui/dialogs/NewRevertDialog.java" kind="src" path="src"/>3 <classpathentry kind="src" path="src"/>
4 <classpathentry exported="true" kind="lib" path="icons" sourcepath="icons"/>4 <classpathentry exported="true" kind="lib" path="icons" sourcepath="icons"/>
5 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>5 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
6 <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>6 <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
7 <classpathentry kind="lib" path="/org.vcs.bazaar.eclipse.client/bzr-java-lib-1.2.0-SNAPSHOT.jar"/>7 <classpathentry kind="lib" path="bzr-java-lib-1.2.0-SNAPSHOT.jar"/>
8 <classpathentry kind="output" path="bin"/>8 <classpathentry kind="output" path="bin"/>
9</classpath>9</classpath>
1010
=== modified file 'org.vcs.bazaar.eclipse.ui/pom.xml'
--- org.vcs.bazaar.eclipse.ui/pom.xml 2012-12-23 20:09:25 +0000
+++ org.vcs.bazaar.eclipse.ui/pom.xml 2013-05-19 02:13:28 +0000
@@ -11,4 +11,44 @@
11 <artifactId>org.vcs.bazaar.eclipse.ui</artifactId>11 <artifactId>org.vcs.bazaar.eclipse.ui</artifactId>
12 <version>${bzr-eclipse-version}</version>12 <version>${bzr-eclipse-version}</version>
13 <packaging>eclipse-plugin</packaging>13 <packaging>eclipse-plugin</packaging>
14 <dependencies>
15 <dependency>
16 <groupId>org.vcs.bazaar.client</groupId>
17 <artifactId>bzr-java-lib</artifactId>
18 <version>1.2.0-SNAPSHOT</version>
19 <scope>compile</scope>
20 </dependency>
21 </dependencies>
22 <build>
23 <plugins>
24 <plugin>
25 <groupId>org.apache.maven.plugins</groupId>
26 <artifactId>maven-dependency-plugin</artifactId>
27 <executions>
28 <execution>
29 <id>copy-dependencies</id>
30 <phase>generate-sources</phase>
31 <goals>
32 <goal>copy</goal>
33 </goals>
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>true</overWrite>
41 </artifactItem>
42 </artifactItems>
43 <overWriteReleases>false</overWriteReleases>
44 <overWriteSnapshots>false</overWriteSnapshots>
45 <overWriteIfNewer>true</overWriteIfNewer>
46 <excludeTransitive>true</excludeTransitive>
47 <outputDirectory>${basedir}</outputDirectory>
48 </configuration>
49 </execution>
50 </executions>
51 </plugin>
52 </plugins>
53 </build>
14</project>54</project>

Subscribers

People subscribed via source and target branches