Skip to content

Commit 862beea

Browse files
author
Yaniv Inbar
committed
Fix various build issues
http://codereview.appspot.com/6448104/
1 parent 1bc52a3 commit 862beea

File tree

7 files changed

+32
-29
lines changed

7 files changed

+32
-29
lines changed

‎.hgignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11

22
syntax: regexp
33
^(.*/)?target$
4+
5+
syntax: regexp
6+
^(.*/)?bin$

‎google-api-client-android2/.classpath‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src/main/java" />
4-
<classpathentry kind="con"
5-
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5" />
6-
<classpathentry kind="con"
7-
path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
8-
<classpathentry kind="output" path="target/classes" />
3+
<classpathentry kind="src" path="src/main/java"/>
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.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
6+
<classpathentry kind="output" path="bin"/>
97
</classpath>

‎google-api-client-appengine/.classpath‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src/main/java" />
4-
<classpathentry kind="src" output="target/test-classes" path="src/test/java" />
5-
<classpathentry kind="con"
6-
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" />
7-
<classpathentry kind="output" path="target/classes" />
8-
<classpathentry kind="con"
9-
path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
3+
<classpathentry kind="src" path="src/main/java"/>
4+
<classpathentry kind="src" path="src/test/java"/>
5+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
6+
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
7+
<classpathentry kind="output" path="bin"/>
108
</classpath>

‎google-api-client-servlet/.classpath‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src/main/java" />
4-
<classpathentry kind="src" path="src/test/java" />
5-
<classpathentry kind="con"
6-
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5" />
7-
<classpathentry kind="output" path="target/classes" />
8-
<classpathentry kind="con"
9-
path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
3+
<classpathentry kind="src" path="src/main/java"/>
4+
<classpathentry kind="src" path="src/test/java"/>
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.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
7+
<classpathentry kind="output" path="bin"/>
108
</classpath>

‎google-api-client/.classpath‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src/main/java" />
4-
<classpathentry kind="src" output="target/test-classes" path="src/test/java" />
5-
<classpathentry kind="con"
6-
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5" />
7-
<classpathentry kind="con"
8-
path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
9-
<classpathentry kind="output" path="target/classes" />
3+
<classpathentry kind="src" path="src/main/java"/>
4+
<classpathentry kind="src" path="src/test/java"/>
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.m2e.MAVEN2_CLASSPATH_CONTAINER"/>
7+
<classpathentry kind="output" path="bin"/>
108
</classpath>

‎google-api-client/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,11 @@
6565
<dependency>
6666
<groupId>com.google.http-client</groupId>
6767
<artifactId>google-http-client-gson</artifactId>
68-
<version>${project.http.version}</version>
6968
<scope>test</scope>
7069
</dependency>
7170
<dependency>
7271
<groupId>com.google.http-client</groupId>
7372
<artifactId>google-http-client-jackson</artifactId>
74-
<version>${project.http.version}</version>
7573
<scope>test</scope>
7674
</dependency>
7775
<dependency>

‎pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,16 @@
148148
<artifactId>google-http-client-appengine</artifactId>
149149
<version>${project.http.version}</version>
150150
</dependency>
151+
<dependency>
152+
<groupId>com.google.http-client</groupId>
153+
<artifactId>google-http-client-gson</artifactId>
154+
<version>${project.http.version}</version>
155+
</dependency>
156+
<dependency>
157+
<groupId>com.google.http-client</groupId>
158+
<artifactId>google-http-client-jackson</artifactId>
159+
<version>${project.http.version}</version>
160+
</dependency>
151161
<dependency>
152162
<groupId>com.google.oauth-client</groupId>
153163
<artifactId>google-oauth-client</artifactId>

0 commit comments

Comments
 (0)