Permalink
Browse files

merge

  • Loading branch information...
2 parents ee4b68e + f4db2c7 commit c2fa6b52bc393cc3a1b243e36a45167c57d3676a @thefosk thefosk committed Oct 19, 2012
View
@@ -93,7 +93,7 @@ Releases
```
###Mashape Java Client Library###
-* Version: **2.0.4**
+* Version: **2.0.5**
* Website: [https://github.com/Mashape/mashape-java-client-library](https://github.com/Mashape/mashape-java-client-library)
``` xml
@@ -0,0 +1 @@
+360b3dab0343ab433f7e51e986959dc8
@@ -0,0 +1 @@
+680d998309c10b52d4a6118bb237a35cb222584e
@@ -0,0 +1,64 @@
+<?xml version="1.0"?>
+<project
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+ xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.mashape.clients</groupId>
+ <artifactId>mashape-java-client</artifactId>
+ <version>2.0.5</version>
+ <name>mashape-java-client</name>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <fork>true</fork>
+ <meminitial>128m</meminitial>
+ <maxmem>512m</maxmem>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>fully.qualified.MainClass</mainClass>
+ </manifest>
+ </archive>
+ <descriptorRefs>
+ <descriptorRef>jar-with-dependencies</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20090211</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.5</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
@@ -0,0 +1 @@
+323273e96ebb38018f22f6bd842c6c6f
@@ -0,0 +1 @@
+2a4e7a4dc790bfe9b8d8b87418e1a53b35b61d62
@@ -3,14 +3,24 @@
<groupId>com.mashape.clients</groupId>
<artifactId>mashape-java-client</artifactId>
<versioning>
+<<<<<<< HEAD
<release>2.0.6</release>
+=======
+ <release>2.0.5</release>
+>>>>>>> f4db2c7664abe6c771cdd8c2e67c8592e459a467
<versions>
<version>2.0.1</version>
<version>2.0.2</version>
<version>2.0.3</version>
<version>2.0.4</version>
+<<<<<<< HEAD
<version>2.0.6</version>
</versions>
<lastUpdated>20121019001700</lastUpdated>
+=======
+ <version>2.0.5</version>
+ </versions>
+ <lastUpdated>20121018014431</lastUpdated>
+>>>>>>> f4db2c7664abe6c771cdd8c2e67c8592e459a467
</versioning>
</metadata>
@@ -1 +1,5 @@
-ce1c097b8152283b676c8422d911e982
+<<<<<<< HEAD
+ce1c097b8152283b676c8422d911e982
+=======
+89295a6e60113a8044e5bee5ae6a22b4
+>>>>>>> f4db2c7664abe6c771cdd8c2e67c8592e459a467
@@ -1 +1,5 @@
-04474167c811a42e195411731dc04d0eed552612
+<<<<<<< HEAD
+04474167c811a42e195411731dc04d0eed552612
+=======
+46efefd5551e6a99a039f006282e0138f218fd2e
+>>>>>>> f4db2c7664abe6c771cdd8c2e67c8592e459a467

0 comments on commit c2fa6b5

Please sign in to comment.