Preparing release 3.14.2

CHANGELOG.md

@@ -1,3 +1,14 @@
+3.14.2 - 05/30/2018
+-----------------
+AdWords:
+  - No changes.
+
+DFP:
+  - Regenerated v201805 service stubs to fix potential unmarshalling error.
+
+Common:
+  - No changes.
+
 3.14.1 - 05/23/2018
 -----------------
 AdWords:

examples/adwords_axis/pom.xml

@@ -23,7 +23,7 @@
 
   <groupId>com.google.api-ads.examples</groupId>
   <artifactId>adwords-axis-examples</artifactId>
-  <version>3.14.1</version>
+  <version>3.14.2</version>
 
   <packaging>jar</packaging>
 
@@ -110,12 +110,12 @@
     <dependency>
       <groupId>com.google.api-ads</groupId>
       <artifactId>ads-lib</artifactId>
-      <version>3.14.1</version>
+      <version>3.14.2</version>
     </dependency>
     <dependency>
       <groupId>com.google.api-ads</groupId>
       <artifactId>adwords-axis</artifactId>
-      <version>3.14.1</version>
+      <version>3.14.2</version>
     </dependency>
 
     <!-- Third party dependencies -->

examples/dfp_axis/pom.xml

@@ -23,7 +23,7 @@
 
   <groupId>com.google.api-ads.examples</groupId>
   <artifactId>dfp-axis-examples</artifactId>
-  <version>3.14.1</version>
+  <version>3.14.2</version>
 
   <packaging>jar</packaging>
   <name>DFP Examples using Axis</name>
@@ -86,12 +86,12 @@
     <dependency>
       <groupId>com.google.api-ads</groupId>
       <artifactId>ads-lib</artifactId>
-      <version>3.14.1</version>
+      <version>3.14.2</version>
     </dependency>
     <dependency>
       <groupId>com.google.api-ads</groupId>
       <artifactId>dfp-axis</artifactId>
-      <version>3.14.1</version>
+      <version>3.14.2</version>
     </dependency>
 
     <!-- Third party dependencies -->

modules/ads_lib/src/main/java/com/google/api/ads/common/lib/conf/props/google-ads-api-java-build.properties

@@ -1,5 +1,5 @@
 lib.name=Common-Java
-lib.version=3.14.1
+lib.version=3.14.2
 # Options are:
 #   internal: not deployed
 #   maven: deployed by maven

modules/adwords_appengine/src/main/java/com/google/api/ads/adwords/jaxws/conf/props/build.properties

@@ -1,2 +1,2 @@
 product.framework.name=AdWords-AppEngine
-product.framework.version=3.14.1
+product.framework.version=3.14.2

modules/adwords_appengine/src/test/java/com/google/api/ads/adwords/jaxws/UserAgentCombinerTest.java

@@ -31,7 +31,7 @@
 public class UserAgentCombinerTest {
 
   private static final String USER_AGENT =
-      "userAgent (AwApi-Java, AdWords-AppEngine/3.14.1, Common-Java/3.14.1,"
+      "userAgent (AwApi-Java, AdWords-AppEngine/3.14.2, Common-Java/3.14.2,"
           + " JAX-WS/Unknown, Java/" + System.getProperty("java.version") + ", maven)";
 
   /**

modules/adwords_appengine/src/test/java/com/google/api/ads/adwords/jaxws/testing/test_request_oauth2.xml

@@ -4,7 +4,7 @@
     <RequestHeader xmlns="https://adwords.google.com/api/adwords/cm/#API_VERSION#">
         <clientCustomerId xmlns="https://adwords.google.com/api/adwords/cm/#API_VERSION#">TEST_CLIENT_CUSTOMER_ID</clientCustomerId>
         <developerToken xmlns="https://adwords.google.com/api/adwords/cm/#API_VERSION#">TEST_DEVELOPER_TOKEN</developerToken>
-        <userAgent xmlns="https://adwords.google.com/api/adwords/cm/#API_VERSION#">TEST_APP (AwApi-Java, AdWords-AppEngine/3.14.1, Common-Java/3.14.1, JAX-WS/Unknown, Java/#JAVA_VERSION#, maven)</userAgent>
+        <userAgent xmlns="https://adwords.google.com/api/adwords/cm/#API_VERSION#">TEST_APP (AwApi-Java, AdWords-AppEngine/3.14.2, Common-Java/3.14.2, JAX-WS/Unknown, Java/#JAVA_VERSION#, maven)</userAgent>
     </RequestHeader>
   </S:Header>
   <S:Body>

modules/adwords_axis/src/main/java/com/google/api/ads/adwords/axis/conf/props/build.properties

@@ -1,2 +1,2 @@
 product.framework.name=AdWords-Axis
-product.framework.version=3.14.1
+product.framework.version=3.14.2

modules/adwords_axis/src/test/java/com/google/api/ads/adwords/axis/UserAgentCombinerTest.java

@@ -31,7 +31,7 @@
 public class UserAgentCombinerTest {
 
   private static final String USER_AGENT =
-      "userAgent (AwApi-Java, AdWords-Axis/3.14.1, Common-Java/3.14.1, Axis/1.4, Java/"
+      "userAgent (AwApi-Java, AdWords-Axis/3.14.2, Common-Java/3.14.2, Axis/1.4, Java/"
           + System.getProperty("java.version") + ", maven)";
 
   /**

modules/adwords_axis/src/test/java/com/google/api/ads/adwords/axis/testing/test_request_oauth2.xml

@@ -4,7 +4,7 @@
     <ns1:RequestHeader soapenv:mustUnderstand="0" xmlns:ns1="https://adwords.google.com/api/adwords/cm/#API_VERSION#">
         <ns1:clientCustomerId>TEST_CLIENT_CUSTOMER_ID</ns1:clientCustomerId>
         <ns1:developerToken>TEST_DEVELOPER_TOKEN</ns1:developerToken>
-        <ns1:userAgent>TEST_APP (AwApi-Java, AdWords-Axis/3.14.1, Common-Java/3.14.1, Axis/1.4, Java/#JAVA_VERSION#, maven)</ns1:userAgent>
+        <ns1:userAgent>TEST_APP (AwApi-Java, AdWords-Axis/3.14.2, Common-Java/3.14.2, Axis/1.4, Java/#JAVA_VERSION#, maven)</ns1:userAgent>
         <ns1:validateOnly>false</ns1:validateOnly>
         <ns1:partialFailure>false</ns1:partialFailure>
     </ns1:RequestHeader>

modules/dfp_appengine/src/main/java/com/google/api/ads/dfp/jaxws/conf/props/build.properties

@@ -1,2 +1,2 @@
 product.framework.name=Dfp-AppEngine
-product.framework.version=3.14.1
+product.framework.version=3.14.2

modules/dfp_appengine/src/main/java/com/google/api/ads/dfp/jaxws/v201708/ApiError.java

@@ -84,6 +84,7 @@
     ProposalLineItemActionError.class,
     CompanyCreditStatusError.class,
     ContactError.class,
+    ContentFilterError.class,
     QuotaError.class,
     WorkflowActionError.class,
     CreativeWrapperError.class,