From 4c7b7008e00b54727c5b542065cd5ab3710857e3 Mon Sep 17 00:00:00 2001 From: penmetsaa Date: Fri, 28 Oct 2016 16:55:12 +0530 Subject: [PATCH 1/2] Update phonenumberutil_test.cc (#1410) --- cpp/test/phonenumbers/phonenumberutil_test.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/test/phonenumbers/phonenumberutil_test.cc b/cpp/test/phonenumbers/phonenumberutil_test.cc index e8b15b390..00b8f625f 100644 --- a/cpp/test/phonenumbers/phonenumberutil_test.cc +++ b/cpp/test/phonenumbers/phonenumberutil_test.cc @@ -1005,7 +1005,7 @@ TEST_F(PhoneNumberUtilTest, FormatWithPreferredCarrierCode) { phone_util_.FormatNationalNumberWithPreferredCarrierCode(ar_number, "15", &formatted_number); EXPECT_EQ("01234 12-5678", formatted_number); - // When the preferred_domestic_carrier_code is present but empty, treat is as + // When the preferred_domestic_carrier_code is present but empty, treat it as // unset and use instead the default carrier code passed in. ar_number.set_preferred_domestic_carrier_code(""); phone_util_.FormatNationalNumberWithPreferredCarrierCode(ar_number, "15", From daf0e0081ec0d113639a00c11b1f693d9755c175 Mon Sep 17 00:00:00 2001 From: Keghani Kouzoujian Date: Fri, 28 Oct 2016 15:56:17 +0200 Subject: [PATCH 2/2] Update release tag to vX.Y.Z (#1409) --- java/pending_code_changes.txt | 3 +++ java/pom.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/java/pending_code_changes.txt b/java/pending_code_changes.txt index c9ffb5d12..c7fc0af6f 100644 --- a/java/pending_code_changes.txt +++ b/java/pending_code_changes.txt @@ -1,3 +1,6 @@ +GitHub project changes: + - Changed tag to vX.Y.Z from libphonenumber-X.Y.Z; this may affect ports and + derived projects. Code changes: - Using new possibleLengthInfo to decide whether a short number is the right length or not. This could result in more specific results; whereas before, a diff --git a/java/pom.xml b/java/pom.xml index 4089264a4..21409c47b 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -146,7 +146,7 @@ maven-release-plugin 2.2.1 - libphonenumber-@{project.version} + v@{project.version}