8000 merge · sdecima/google-http-java-client@db70575 · GitHub
[go: up one dir, main page]
Skip to content

Commit db70575

Browse files
rmistryrmistry
committed
merge
2 parents ab02df6 + 269ac41 commit db70575

File tree

20 files changed

+331
-116
lines changed

20 files changed

+331
-116
lines changed

‎google-http-client-assembly/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.http-client</groupId>
66
<artifactId>google-http-client-parent</artifactId>
7-
<version>1.6.0-beta-SNAPSHOT</version>
7+
<version>1.7.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<groupId>com.google.http-client</groupId>

‎google-http-client-extensions-android2/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
<classpathentry kind="con"
55
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5" />
66
<classpathentry kind="con"
7-
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
7+
path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
88
<classpathentry kind="output" path="target/classes" />
99
</classpath>

‎google-http-client-extensions-android2/.project

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
</arguments>
1212
</buildCommand>
1313
<buildCommand>
14-
<name>org.maven.ide.eclipse.maven2Builder</name>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
1515
<arguments>
1616
</arguments>
1717
</buildCommand>
1818
</buildSpec>
1919
<natures>
2020
<nature>org.eclipse.jdt.core.javanature</nature>
21-
<nature>org.maven.ide.eclipse.maven2Nature</nature>
21+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2222
</natures>
2323
</projectDescription>

‎google-http-client-extensions-android2/pom.xml

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.http-client</groupId>
66
<artifactId>google-http-client-parent</artifactId>
7-
<version>1.6.0-beta-SNAPSHOT</version>
7+
<version>1.7.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-http-client-extensions-android2</artifactId>
@@ -54,6 +54,35 @@
5454
</executions>
5555
</plugin>
5656
</plugins>
57+
<pluginManagement>
58+
<plugins>
59+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
60+
<plugin>
61+
<groupId>org.eclipse.m2e</groupId>
62+
<artifactId>lifecycle-mapping</artifactId>
63+
<version>1.0.0</version>
64+
<configuration>
65+
<lifecycleMappingMetadata>
66+
<pluginExecutions>
67+
<pluginExecution>
68+
<pluginExecutionFilter>
69+
<groupId>org.apache.maven.plugins</groupId>
70+
<artifactId>maven-jar-plugin</artifactId>
71+
<versionRange>[2.3.1,)</versionRange>
72+
<goals>
73+
<goal>jar</goal>
74+
</goals>
75+
</pluginExecutionFilter>
76+
<action>
77+
<ignore></ignore>
78+
</action>
79+
</pluginExecution>
80+
</pluginExecutions>
81+
</lifecycleMappingMetadata>
82+
</configuration>
83+
</plugin>
84+
</plugins>
85+
</pluginManagement>
5786
</build>
5887
<dependencies>
5988
<dependency>

‎google-http-client-extensions-android3/.classpath

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
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/JavaSE-1.6"/>
5-
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
6-
<classpathentry kind="output" path="target/classes"/>
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/JavaSE-1.6" />
6+
<classpathentry kind="con"
7+
path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
8+
<classpathentry kind="output" path="target/classes" />
79
</classpath>

‎google-http-client-extensions-android3/.project

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
</arguments>
1212
</buildCommand>
1313
<buildCommand>
14-
<name>org.maven.ide.eclipse.maven2Builder</name>
14+
<name>org.eclipse.m2e.core.maven2Builder</name>
1515
<arguments>
1616
</arguments>
1717
</buildCommand>
1818
</buildSpec>
1919
<natures>
2020
<nature>org.eclipse.jdt.core.javanature</nature>
21-
<nature>org.maven.ide.eclipse.maven2Nature</nature>
21+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
2222
</natures>
2323
</projectDescription>

‎google-http-client-extensions-android3/pom.xml

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.http-client</groupId>
66
<artifactId>google-http-client-parent</artifactId>
7-
<version>1.6.0-beta-SNAPSHOT</version>
7+
<version>1.7.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-http-client-extensions-android3</artifactId>
@@ -54,6 +54,35 @@
5454
</executions>
5555
</plugin>
5656
</plugins>
57+
<pluginManagement>
58+
<plugins>
59+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
60+
<plugin>
61+
<groupId>org.eclipse.m2e</groupId>
62+
<artifactId>lifecycle-mapping</artifactId>
63+
<version>1.0.0</version>
64+
<configuration>
65+
<lifecycleMappingMetadata>
66+
<pluginExecutions>
67+
<pluginExecution>
68+
<pluginExecutionFilter>
69+
<groupId>org.apache.maven.plugins</groupId>
70+
<artifactId>maven-jar-plugin</artifactId>
71+
<versionRange>[2.3.1,)</versionRange>
72+
<goals>
73+
<goal>jar</goal>
74+
</goals>
75+
</pluginExecutionFilter>
76+
<action>
77+
<ignore></ignore>
78+
</action>
79+
</pluginExecution>
80+
</pluginExecutions>
81+
</lifecycleMappingMetadata>
82+
</configuration>
83+
</plugin>
84+
</plugins>
85+
</pluginManagement>
5786
</build>
5887
<dependencies>
5988
<dependency>

‎google-http-client-extensions/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
<classpathentry kind="con"
66
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5" />
77
<classpathentry kind="con"
8-
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
8+
path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
99
<classpathentry kind="output" path="target/classes" />
1010
</classpath>

‎google-http-client-extensions/.project

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>google-http-client-extensions</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.maven.ide.eclipse.maven2Builder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
</buildSpec>
19-
<natures>
20-
<nature>org.eclipse.jdt.core.javanature</nature>
21-
<nature>org.maven.ide.eclipse.maven2Nature</nature>
22-
</natures>
3+
<name>google-http-client-extensions</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.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
22+
</natures>
2323
</projectDescription>

‎google-http-client-extensions/pom.xml

Lines changed: 30 additions & 2 deletions
< 10000 td data-grid-cell-id="diff-17e1d1b9b1dcafe1c96ec4503660f0b9e9d24f85d57df2eec0eaa38e738c662a-9-9-0" data-selected="false" role="gridcell" style="background-color:var(--bgColor-default);text-align:center" tabindex="-1" valign="top" class="focusable-grid-cell diff-line-number position-relative diff-line-number-neutral left-side">9
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
<parent>
55
<groupId>com.google.http-client</groupId>
66
<artifactId>google-http-client-parent</artifactId>
7-
<version>1.6.0-beta-SNAPSHOT</version>
7+
<version>1.7.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
9
</parent>
10-
<groupId>com.google.http-client</groupId>
1110
<artifactId>google-http-client-extensions</artifactId>
1211
<name>Platform extensions to the Google HTTP Client Library for Java.</name>
1312
<build>
@@ -55,6 +54,35 @@
5554
</executions>
5655
</plugin>
5756
</plugins>
57+
<pluginManagement>
58+
<plugins>
59+
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
60+
<plugin>
61+
<groupId>org.eclipse.m2e</groupId>
62+
<artifactId>lifecycle-mapping</artifactId>
63+
<version>1.0.0</version>
64+
<configuration>
65+
<lifecycleMappingMetadata>
66+
<pluginExecutions>
67+
<pluginExecution>
68+
<pluginExecutionFilter>
69+
<groupId>org.apache.maven.plugins</groupId>
70+
<artifactId>maven-jar-plugin</artifactId>
71+
<versionRange>[2.3.1,)</versionRange>
72+
<goals>
73+
<goal>jar</goal>
74+
</goals>
75+
</pluginExecutionFilter>
76+
<action>
77+
<ignore></ignore>
78+
</action>
79+
</pluginExecution>
80+
</pluginExecutions>
81+
</lifecycleMappingMetadata>
82+
</configuration>
83+
</plugin>
84+
</plugins>
85+
</pluginManagement>
5886
</build>
5987
<dependencies>
6088
<dependency>

‎google-http-client/.classpath

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22
<classpath>
33
<classpathentry kind="src" path="src/main/java" />
44
<classpathentry kind="src" output="target/test-classes" path="src/test/java" />
5-
<classpathentry kind="src" output="target/test-classes" path="target/generated-test-sources" />
5+
<classpathentry kind="src" output="target/test-classes"
6+
path="target/generated-test-sources" />
67
<classpathentry kind="con"
78
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5" />
8-
<classpathentry kind="con"
9-
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER" />
109
<classpathentry kind="output" path="target/classes" />
10+
<classpathentry kind="con"
11+
path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER" />
1112
</classpath>

‎google-http-client/.project

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<projectDescription>
3-
<name>google-http-client</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.maven.ide.eclipse.maven2Builder</name>
15-
<arguments>
16-
</arguments>
17-
</buildCommand>
18-
</buildSpec>
19-
<natures>
20-
<nature>org.eclipse.jdt.core.javanature</nature>
21-
<nature>org.maven.ide.eclipse.maven2Nature</nature>
22-
</natures>
3+
<name>google-http-client</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.m2e.core.maven2Builder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
</buildSpec>
19+
<natures>
20+
<nature>org.eclipse.jdt.core.javanature</nature>
21+
<nature>org.eclipse.m2e.core.maven2Nature</nature>
22+
</natures>
2323
</projectDescription>

‎google-http-client/pom.xml

Lines changed: 62 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.google.http-client</groupId>
66
<artifactId>google-http-client-parent</artifactId>
7-
<version>1.6.0-beta-SNAPSHOT</version>
7+
<version>1.7.0-beta-SNAPSHOT</version>
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-http-client</artifactId>
@@ -100,8 +100,69 @@
100100
</executions>
101101
</plugin>
102102
</plugins>
103+
<pluginManagement>
104+
<plugins>
105+
<!--This plugin's configuration is used to store Eclipse m2e settings only.
106+
It has no influence on the Maven build itself. -->
107+
<plugin>
108+
<groupId>org.eclipse.m2e</groupId>
109+
<artifactId>lifecycle-mapping</artifactId>
110+
<version>1.0.0</version>
111+
<configuration>
112+
<lifecycleMappingMetadata>
113+
<pluginExecutions>
114+
<pluginExecution>
115+
<pluginExecutionFilter>
116+
<groupId>org.apache.maven.plugins</groupId>
117+
<artifactId>maven-jar-plugin</artifactId>
118+
<versionRange>[2.3.1,)</versionRange>
119+
<goals>
120+
<goal>jar</goal>
121+
</goals>
122+
</pluginExecutionFilter>
123+
<action>
124+
<ignore></ignore>
125+
</action>
126+
</pluginExecution>
127+
<pluginExecution>
128+
<pluginExecutionFilter>
129+
<groupId>org.apache.maven.plugins</groupId>
130+
<artifactId>maven-antrun-plugin</artifactId>
131+
<versionRange>[1.6,)</versionRange>
132+
<goals>
133+
<goal>run</goal>
134+
</goals>
135+
</pluginExecutionFilter>
136+
<action>
137+
<ignore></ignore>
138+
</action>
139+
</pluginExecution>
140+
<pluginExecution>
141+
<pluginExecutionFilter>
142+
<groupId>org.codehaus.mojo</groupId>
143+
<artifactId>build-helper-maven-plugin</artifactId>
144+
<versionRange>[1.5,)</versionRange>
145+
<goals>
146+
<goal>add-test-source</goal>
147+
</goals>
148+
</pluginExecutionFilter>
149+
<action>
150+
<ignore></ignore>
151+
</action>
152+
</pluginExecution>
153+
</pluginExecutions>
154+
</lifecycleMappingMetadata>
155+
</configuration>
156+
</plugin>
157+
</plugins>
158+
</pluginManagement>
103159
</build>
104160
<dependencies>
161+
<dependency>
162+
<groupId>com.google.android</groupId>
163+
<artifactId>android</artifactId>
164+
<version>1.5_r4</version>
165+
</dependency>
105166
<dependency>
106167
<groupId>com.google.code.findbugs</groupId>
107168
<artifactId>jsr305</artifactId>

0 commit comments

Comments
 (0)
0