Merge

Author: ngmiceli-g

plus-appengine-sample/pom.xml

@@ -34,7 +34,7 @@
 
   <properties>
     <google-api-client.version>1.16.0-rc</google-api-client.version>
-    <appengine-sdk.version>1.8.2</appengine-sdk.version>
+    <project.appengine.version>1.8.3</project.appengine.version>
     <webappDirectory>${project.build.directory}/${project.build.finalName}
     </webappDirectory>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -71,7 +71,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>${appengine-sdk.version}</version>
+        <version>${project.appengine.version}</version>
         <configuration>
           <port>8888</port>
         </configuration>
@@ -180,7 +180,7 @@
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>${appengine-sdk.version}</version>
+      <version>${project.appengine.version}</version>
     </dependency>
   </dependencies>
-</project>
+</project>

plus-preview-appengine-sample/pom.xml

@@ -38,6 +38,7 @@
     <webappDirectory>${project.build.directory}/${project.build.finalName}
     </webappDirectory>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.appengine.version>1.8.3</project.appengine.version>
   </properties>
 
   <developers>
@@ -72,7 +73,7 @@
       <plugin>
         <groupId>com.google.appengine</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>1.8.0</version>
+        <version>${project.appengine.version}</version>
         <configuration>
           <port>8888</port>
         </configuration>
@@ -182,7 +183,7 @@
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>1.8.0</version>
+      <version>${project.appengine.version}</version>
     </dependency>
   </dependencies>
 </project>