8000 Merge branch 'master' into issue-490 · geri-m/google-http-java-client@4f28c5e · GitHub
[go: up one dir, main page]
Skip to content

Commit 4f28c5e

Browse files
geri-mgeri-m
committed
Merge branch 'master' into issue-490
* master: Bump next snapshot (googleapis#500) Release google-http-java-client v1.26.0 (googleapis#495) Revert "add patch to google http client (googleapis#486)" (googleapis#493) Enable releasetool for this project (googleapis#488) Fix CODEOWNERS path
2 parents b687458 + 24a0f5e commit 4f28c5e

File tree

39 files changed

+129
-97
lines changed

39 files changed

+129
-97
lines changed

‎.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@googleapis/yoshi-java
1+
* @googleapis/yoshi-java

‎.kokoro/build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,7 @@ cd github/google-http-java-client/
2121
java -version
2222
echo $JOB_TYPE
2323

24+
export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
25+
2426
mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V
2527
mvn test -B

‎google-http-client-android-test/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<groupId>google-http-client</groupId>
55
<artifactId>google-http-client-android-test</artifactId>
66
<name>Test project for google-http-client-android.</name>
7-
<version>1.26.0-SNAPSHOT</version>
7+
<version>1.26.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-android-test:current} -->
88
<packaging>apk</packaging>
99

1010
<build>
@@ -53,7 +53,7 @@
5353
<dependency>
5454
<groupId>com.google.http-client</groupId>
5555
<artifactId>google-http-client-android</artifactId>
56-
<version>1.26.0-SNAPSHOT</version>
56+
<version>1.26.0-1.26.0</version>
5757
<exclusions>
5858
<exclusion>
5959
<artifactId>android</artifactId>
@@ -72,7 +72,7 @@
7272
<dependency>
7373
<groupId>com.google.http-client</groupId>
7474
<artifactId>google-http-client-test</artifactId>
75-
<version>1.26.0-SNAPSHOT</version>
75+
<version>1.26.0</version>
7676
<exclusions>
7777
<exclusion>
7878
<artifactId>junit</artifactId>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@
44
<parent>
55
<groupId>com.google.http-client</groupId>
66
<artifactId>google-http-client-parent</artifactId>
7-
<version>1.26.0-SNAPSHOT</version>
7+
<version>1.26.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-http-client-android</artifactId>
11+
<version>1.26.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
1112
<name>Android Platform Extensions to the Google HTTP Client Library for Java.</name>
1213

1314
<build>

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
<parent>
55
<groupId>com.google.http-client</groupId>
66
<artifactId>google-http-client-parent</artifactId>
7-
<version>1.26.0-SNAPSHOT</version>
7+
<version>1.26.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
88
<relativePath>../pom.xml</relativePath>
99
</parent>
1010
<artifactId>google-http-client-appengine</artifactId>
11+
<version>1.26.1-SNAPSHOT</version><!-- {x-version-update:google-http-client-appengine:current} -->
1112
<name>Google App Engine extensions to the Google HTTP Client Library for Java.</name>
13+
1214
<build>
1315
<plugins>
1416
<plugin>

‎google-http-client-assembly/android-properties/google-http-client-1.26.0-SNAPSHOT.jar.properties renamed to ‎google-http-client-assembly/android-properties/google-http-client-1.26.0.jar.properties

File renamed without changes.

‎google-http-client-assembly/android-properties/google-http-client-android-1.26.0-SNAPSHOT.jar.properties renamed to ‎google-http-client-assembly/android-properties/google-http-client-android-1.26.0.jar.properties

File renamed without changes.

‎google-http-client-assembly/android-properties/google-http-client-gson-1.26.0-SNAPSHOT.jar.properties renamed to ‎google-http-client-assembly/android-properties/google-http-client-gson-1.26.0.jar.properties

File renamed without changes.

‎google-http-client-assembly/android-properties/google-http-client-jackson-1.26.0-SNAPSHOT.jar.properties renamed to ‎google-http-client-assembly/android-properties/google-http-client-jackson-1.26.0.jar.properties

File renamed without changes.

‎google-http-client-assembly/android-properties/google-http-client-jackson2-1.26.0-SNAPSHOT.jar.properties renamed to ‎google-http-client-assembly/android-properties/google-http-client-jackson2-1.26.0.jar.properties

File renamed without changes.

0 commit comments

Comments
 (0)
0