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
1=== modified file 'org.vcs.bazaar.eclipse.client/.classpath'
2--- org.vcs.bazaar.eclipse.client/.classpath 2011-07-30 22:37:22 +0000
3+++ org.vcs.bazaar.eclipse.client/.classpath 2013-05-19 02:13:28 +0000
4@@ -1,6 +1,6 @@
5 <?xml version="1.0" encoding="UTF-8"?>
6 <classpath>
7- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
8- <classpathentry exported="true" kind="lib" path="bzr-java-lib-0.5.3-SNAPSHOT.jar"/>
9+ <classpathentry exported="true" kind="lib" path="bzr-java-lib-1.2.0-SNAPSHOT.jar"/>
10+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
11 <classpathentry kind="output" path="bin"/>
12 </classpath>
13
14=== modified file 'org.vcs.bazaar.eclipse.core.tests/.classpath'
15--- org.vcs.bazaar.eclipse.core.tests/.classpath 2011-07-30 00:28:03 +0000
16+++ org.vcs.bazaar.eclipse.core.tests/.classpath 2013-05-19 02:13:28 +0000
17@@ -1,7 +1,7 @@
18 <?xml version="1.0" encoding="UTF-8"?>
19 <classpath>
20- <classpathentry excluding="org/vcs/bazaar/eclipse/core/status/SynchronizerSyncInfoCache.java" kind="src" path="src"/>
21- <classpathentry exported="true" kind="lib" path="bzr-java-lib-0.5.3-SNAPSHOT-tests.jar"/>
22+ <classpathentry kind="src" path="src"/>
23+ <classpathentry exported="true" kind="lib" path="bzr-java-lib-1.2.0-SNAPSHOT-tests.jar"/>
24 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
25 <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
26 <classpathentry kind="output" path="bin"/>
27
28=== modified file 'org.vcs.bazaar.eclipse.core/.classpath'
29--- org.vcs.bazaar.eclipse.core/.classpath 2011-07-30 00:28:03 +0000
30+++ org.vcs.bazaar.eclipse.core/.classpath 2013-05-19 02:13:28 +0000
31@@ -1,6 +1,6 @@
32 <?xml version="1.0" encoding="UTF-8"?>
33 <classpath>
34- <classpathentry excluding="org/vcs/bazaar/eclipse/core/status/SynchronizerSyncInfoCache.java" kind="src" path="src"/>
35+ <classpathentry kind="src" path="src"/>
36 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
37 <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
38 <classpathentry kind="output" path="bin"/>
39
40=== modified file 'org.vcs.bazaar.eclipse.ui/.classpath'
41--- org.vcs.bazaar.eclipse.ui/.classpath 2013-03-24 21:26:41 +0000
42+++ org.vcs.bazaar.eclipse.ui/.classpath 2013-05-19 02:13:28 +0000
43@@ -1,9 +1,9 @@
44 <?xml version="1.0" encoding="UTF-8"?>
45 <classpath>
46- <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"/>
47+ <classpathentry kind="src" path="src"/>
48 <classpathentry exported="true" kind="lib" path="icons" sourcepath="icons"/>
49 <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
50 <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
51- <classpathentry kind="lib" path="/org.vcs.bazaar.eclipse.client/bzr-java-lib-1.2.0-SNAPSHOT.jar"/>
52+ <classpathentry kind="lib" path="bzr-java-lib-1.2.0-SNAPSHOT.jar"/>
53 <classpathentry kind="output" path="bin"/>
54 </classpath>
55
56=== modified file 'org.vcs.bazaar.eclipse.ui/pom.xml'
57--- org.vcs.bazaar.eclipse.ui/pom.xml 2012-12-23 20:09:25 +0000
58+++ org.vcs.bazaar.eclipse.ui/pom.xml 2013-05-19 02:13:28 +0000
59@@ -11,4 +11,44 @@
60 <artifactId>org.vcs.bazaar.eclipse.ui</artifactId>
61 <version>${bzr-eclipse-version}</version>
62 <packaging>eclipse-plugin</packaging>
63+ <dependencies>
64+ <dependency>
65+ <groupId>org.vcs.bazaar.client</groupId>
66+ <artifactId>bzr-java-lib</artifactId>
67+ <version>1.2.0-SNAPSHOT</version>
68+ <scope>compile</scope>
69+ </dependency>
70+ </dependencies>
71+ <build>
72+ <plugins>
73+ <plugin>
74+ <groupId>org.apache.maven.plugins</groupId>
75+ <artifactId>maven-dependency-plugin</artifactId>
76+ <executions>
77+ <execution>
78+ <id>copy-dependencies</id>
79+ <phase>generate-sources</phase>
80+ <goals>
81+ <goal>copy</goal>
82+ </goals>
83+ <configuration>
84+ <artifactItems>
85+ <artifactItem>
86+ <groupId>org.vcs.bazaar.client</groupId>
87+ <artifactId>bzr-java-lib</artifactId>
88+ <type>jar</type>
89+ <overWrite>true</overWrite>
90+ </artifactItem>
91+ </artifactItems>
92+ <overWriteReleases>false</overWriteReleases>
93+ <overWriteSnapshots>false</overWriteSnapshots>
94+ <overWriteIfNewer>true</overWriteIfNewer>
95+ <excludeTransitive>true</excludeTransitive>
96+ <outputDirectory>${basedir}</outputDirectory>
97+ </configuration>
98+ </execution>
99+ </executions>
100+ </plugin>
101+ </plugins>
102+ </build>
103 </project>

Subscribers

People subscribed via source and target branches