Merge branch 'stable'

paypal · Dec 9, 2014 · 8df45b5 · 8df45b5
2 parents ed929b0 + f9dcf82
commit 8df45b5
Show file tree

Hide file tree

Showing 38 changed files with 1,268 additions and 1,039 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 CHANGELOG
-========= 
+=========
+V0.12.2 (December 5, 2014)
+--------------------------
+   * Grouped tests into 2 subsets: unit tests and integration tests
+   * Disabled integration tests by default
+
 V0.12.1 (November 25, 2014)
 ---------------------------
    * Fixed test case issues

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.paypal.sdk</groupId>
   <artifactId>rest-api</artifactId>
-  <version>0.12.1</version>
+  <version>0.12.2</version>
   <packaging>pom</packaging>
 
   <name>rest-api</name>

diff --git a/rest-api-sample/pom.xml b/rest-api-sample/pom.xml
@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.paypal.sdk</groupId>
 	<artifactId>rest-api-sample</artifactId>
-	<version>0.12.1</version>
+	<version>0.12.2</version>
 	<name>REST API SAMPLE</name>
 	<packaging>war</packaging>
 	<dependencies>

diff --git a/rest-api-sdk/pom.xml b/rest-api-sdk/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.paypal.sdk</groupId>
     <artifactId>rest-api-sdk</artifactId>
-    <version>0.12.1</version>
+    <version>0.12.2</version>
     <packaging>jar</packaging>
     <name>REST API SDK</name>
     <description>PayPal SDK for integrating with the REST APIs</description>
@@ -89,7 +89,7 @@
 				<configuration>
 					<parallel>methods</parallel>
 					<threadCount>10</threadCount>
-					<excludedGroups>integration</excludedGroups>
+					<groups>unit</groups>
 				</configuration>
 			</plugin>
 		</plugins>