Skip to content

Commit

Permalink
merging
Browse files Browse the repository at this point in the history
  • Loading branch information
@shatsar
shatsar committed May 2, 2013
2 parents f637fd6 + 1fc2aa5 commit 5655e81
Show file tree
Hide file tree
Showing 135 changed files with 689 additions and 24 deletions.
36 changes: 18 additions & 18 deletions README.md
View file
@@ -1,6 +1,6 @@
MVNRepo
======================
This is a public Maven Repository hosted on GitHub that we use on [Mashape](http://www.mashape.com/).
This is a public Maven Repository hosted on `http://maven.mashape.com` that we use on [Mashape](http://www.mashape.com/).

You are free to use in your projects, and contribute to it.

Expand All @@ -11,7 +11,7 @@ Add the following code to your `pom.xml` for **releases** libraries:
``` xml
<repository>
<id>mashape-releases</id>
<url>https://github.com/Mashape/MVNRepo/raw/master/releases</url>
<url>http://maven.mashape.com/releases</url>
</repository>
```

Expand All @@ -20,7 +20,7 @@ Add the following code to your `pom.xml` for **snapshots** libraries:
``` xml
<repository>
<id>mashape-snapshots</id>
<url>https://github.com/Mashape/MVNRepo/raw/master/snapshots</url>
<url>http://maven.mashape.com/snapshots</url>
</repository>
```

Expand All @@ -44,7 +44,7 @@ For example:

```
mvn deploy:deploy-file -Dpackaging=jar \
-DgroupId=com.braintreegateway
-DgroupId=com.braintreegateway \
-DartifactId=braintree \
-Dversion=2.13.1 \
-Dfile=braintree-java-2.13.1.jar \
Expand All @@ -68,6 +68,18 @@ Be aware that the code above must be customized with the right arguments:
Releases
--------

###Unicorn-Java###
* Version: **1.0.0**
* Website: [http://getunicorn.io](http://getunicorn.io/)

``` xml
<dependency>
<groupId>com.mashape.unirest</groupId>
<artifactId>unirest-java</artifactId>
<version>1.0.0</version>
</dependency>
```

###Braintree###
* Version: **2.13.2**
* Website: [http://www.braintreepayments.com](http://www.braintreepayments.com/)
Expand All @@ -93,14 +105,14 @@ Releases
```

###Mashape Java Client Library###
* Version: **1.2.0**
* Version: **2.0.13**
* Website: [https://github.com/Mashape/mashape-java-client-library](https://github.com/Mashape/mashape-java-client-library)

``` xml
<dependency>
<groupId>com.mashape.clients</groupId>
<artifactId>mashape-java-client</artifactId>
<version>1.2.0</version>
<version>2.0.13</version>
</dependency>
```

Expand All @@ -116,18 +128,6 @@ Releases
</dependency>
```

###Mashape Java Client###
* Version: **1.1.0**
* Website: [http://www.mashape.com/docs/consume/java](www.mashape.com/docs/consume/java)

``` xml
<dependency>
<groupId>com.mashape.clients</groupId>
<artifactId>mashape-java-client</artifactId>
<version>1.1.0</version>
</dependency>
```

###jbeandumer###
* Version: **1.5.1**
* Website: [http://code.google.com/p/jbeandumer/](http://code.google.com/p/jbeandumer/)
Expand Down
Binary file added releases/com/mashape/clients/mashape-java-client/1.3.1/mashape-java-client-1.3.1.jar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.1/mashape-java-client-1.3.1.jar.md5
View file
@@ -0,0 +1 @@
8bc96cec24c56870f033dde0d9fb4b15
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.1/mashape-java-client-1.3.1.jar.sha1
View file
@@ -0,0 +1 @@
d272994c8b4c27191b626c546a2fe83074ae382c
8 changes: 8 additions & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.1/mashape-java-client-1.3.1.pom
View file
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>1.3.1</version>
</project>
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.1/mashape-java-client-1.3.1.pom.md5
View file
@@ -0,0 +1 @@
a83cb2fb1aa9ef8daf49a0f628475b35
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.1/mashape-java-client-1.3.1.pom.sha1
View file
@@ -0,0 +1 @@
ce878252afd507fbcf78bd136410a7c4b947e770
Binary file added releases/com/mashape/clients/mashape-java-client/1.3.2/mashape-java-client-1.3.2.jar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.2/mashape-java-client-1.3.2.jar.md5
View file
@@ -0,0 +1 @@
f4f943544e6d349eedd29655d24e0310
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.2/mashape-java-client-1.3.2.jar.sha1
View file
@@ -0,0 +1 @@
109de80e50250cc894a00687b0c147edec198892
8 changes: 8 additions & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.2/mashape-java-client-1.3.2.pom
View file
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>1.3.2</version>
</project>
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.2/mashape-java-client-1.3.2.pom.md5
View file
@@ -0,0 +1 @@
d5c03c458298ac51ae54e66daae67364
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.2/mashape-java-client-1.3.2.pom.sha1
View file
@@ -0,0 +1 @@
20ba9c58842d7e58f33a54eefb2c7831b71d0a57
Binary file added releases/com/mashape/clients/mashape-java-client/1.3.3/mashape-java-client-1.3.3.jar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.3/mashape-java-client-1.3.3.jar.md5
View file
@@ -0,0 +1 @@
c600cc3a95c5fb002dc9824219e2444c
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.3/mashape-java-client-1.3.3.jar.sha1
View file
@@ -0,0 +1 @@
abf1f82b84d5b0f920ffb3aba1d9cce2c254da08
8 changes: 8 additions & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.3/mashape-java-client-1.3.3.pom
View file
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>1.3.3</version>
</project>
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.3/mashape-java-client-1.3.3.pom.md5
View file
@@ -0,0 +1 @@
36492fb029da8064aa176549c98cd0a6
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.3/mashape-java-client-1.3.3.pom.sha1
View file
@@ -0,0 +1 @@
bfcdfce2ecc1b77328300fbc1b80ddf99ee5d0d2
Binary file added releases/com/mashape/clients/mashape-java-client/1.3.4/mashape-java-client-1.3.4.jar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.4/mashape-java-client-1.3.4.jar.md5
View file
@@ -0,0 +1 @@
c906fa8a2ad59352910b378cd2651986
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.4/mashape-java-client-1.3.4.jar.sha1
View file
@@ -0,0 +1 @@
b265fd5b1d04af53f41bceba76d25636bae2ddbe
8 changes: 8 additions & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.4/mashape-java-client-1.3.4.pom
View file
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>1.3.4</version>
</project>
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.4/mashape-java-client-1.3.4.pom.md5
View file
@@ -0,0 +1 @@
9e2557af39b4977b730fdd5ec5c70913
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.4/mashape-java-client-1.3.4.pom.sha1
View file
@@ -0,0 +1 @@
80e0ff30afffab3238e38713446e98a5e1837623
Binary file added releases/com/mashape/clients/mashape-java-client/1.3.5/mashape-java-client-1.3.5.jar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.5/mashape-java-client-1.3.5.jar.md5
View file
@@ -0,0 +1 @@
558d9b3276eb71879b3c243f33e7690d
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.5/mashape-java-client-1.3.5.jar.sha1
View file
@@ -0,0 +1 @@
1fc38bcee29de4f6401fd53599c64fa42f360743
8 changes: 8 additions & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.5/mashape-java-client-1.3.5.pom
View file
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>1.3.5</version>
</project>
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.5/mashape-java-client-1.3.5.pom.md5
View file
@@ -0,0 +1 @@
a4e8d08f0e2559287cc17447e92c4006
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.5/mashape-java-client-1.3.5.pom.sha1
View file
@@ -0,0 +1 @@
0996cc61f308d8503e84ae43d0ec46051d4b00b2
6 changes: 5 additions & 1 deletion releases/com/mashape/clients/mashape-java-client/1.3.6/mashape-java-client-1.3.6.jar.md5
View file
@@ -1 +1,5 @@
60ae926820e00a43abf95e9fa1fa9de6
<<<<<<< HEAD
60ae926820e00a43abf95e9fa1fa9de6
=======
e525c6dea2c12b3f334312be188840b2
>>>>>>> upstream/master
6 changes: 5 additions & 1 deletion releases/com/mashape/clients/mashape-java-client/1.3.6/mashape-java-client-1.3.6.jar.sha1
View file
@@ -1 +1,5 @@
8c77f620c97a780969a243a682cf3feadddfa3e7
<<<<<<< HEAD
8c77f620c97a780969a243a682cf3feadddfa3e7
=======
97be3511d995e3debaca832ae3a820a11067a01e
>>>>>>> upstream/master
3 changes: 3 additions & 0 deletions releases/com/mashape/clients/mashape-java-client/1.3.6/mashape-java-client-1.3.6.pom
View file
Expand Up @@ -45,11 +45,14 @@
<version>4.1.1</version>
</dependency>
<dependency>
<<<<<<< HEAD
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.4</version>
</dependency>
<dependency>
=======
>>>>>>> upstream/master
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpmime</artifactId>
<version>4.1.1</version>
Expand Down
6 changes: 5 additions & 1 deletion releases/com/mashape/clients/mashape-java-client/1.3.6/mashape-java-client-1.3.6.pom.md5
View file
@@ -1 +1,5 @@
4b7fce4d4d8b4b51454bc74f74dc0519
<<<<<<< HEAD
4b7fce4d4d8b4b51454bc74f74dc0519
=======
b9aafa94c847a7ae8bd28fb3fae0ce2a
>>>>>>> upstream/master
6 changes: 5 additions & 1 deletion releases/com/mashape/clients/mashape-java-client/1.3.6/mashape-java-client-1.3.6.pom.sha1
View file
@@ -1 +1,5 @@
6ca719ab6eb17f1b0b2c48440b8b4f7e521f6e2d
<<<<<<< HEAD
6ca719ab6eb17f1b0b2c48440b8b4f7e521f6e2d
=======
df7deb76a35afb2c81460049b296bfb4203bb4d2
>>>>>>> upstream/master
Binary file added releases/com/mashape/clients/mashape-java-client/2.0.1/mashape-java-client-2.0.1.jar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/2.0.1/mashape-java-client-2.0.1.jar.md5
View file
@@ -0,0 +1 @@
ea004cba33f7ac79c80d3fbe55ce2d2b
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/2.0.1/mashape-java-client-2.0.1.jar.sha1
View file
@@ -0,0 +1 @@
542e2f08118874936af54281cafe19b19455bcfe
8 changes: 8 additions & 0 deletions releases/com/mashape/clients/mashape-java-client/2.0.1/mashape-java-client-2.0.1.pom
View file
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<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.1</version>
</project>
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/2.0.1/mashape-java-client-2.0.1.pom.md5
View file
@@ -0,0 +1 @@
65e220fd72a4b5e0dd11996f0e0b1b07
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/2.0.1/mashape-java-client-2.0.1.pom.sha1
View file
@@ -0,0 +1 @@
cec3fe6b85e889d971ee330de508f335f5c75586
Binary file added releases/com/mashape/clients/mashape-java-client/2.0.10/mashape-java-client-2.0.10.jar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/2.0.10/mashape-java-client-2.0.10.jar.md5
View file
@@ -0,0 +1 @@
4a12bc8cfa4fcb44901938e156ecf38b
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/2.0.10/mashape-java-client-2.0.10.jar.sha1
View file
@@ -0,0 +1 @@
eaa3c64479cb20e0ca3bc547fb0928dfc49b92e2
69 changes: 69 additions & 0 deletions releases/com/mashape/clients/mashape-java-client/2.0.10/mashape-java-client-2.0.10.pom
View file
@@ -0,0 +1,69 @@
<?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.10</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>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.2.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<scope>test</scope>
</dependency>
</dependencies>
</project>
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/2.0.10/mashape-java-client-2.0.10.pom.md5
View file
@@ -0,0 +1 @@
e7eff1467b5dc2ef1e3f883eab6b280a
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/2.0.10/mashape-java-client-2.0.10.pom.sha1
View file
@@ -0,0 +1 @@
254f4b0743bcb20d0f75db82aec89e742b2696b7
Binary file added releases/com/mashape/clients/mashape-java-client/2.0.11/mashape-java-client-2.0.11.jar
View file
Binary file not shown.
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/2.0.11/mashape-java-client-2.0.11.jar.md5
View file
@@ -0,0 +1 @@
986d2217850e6509577218c25d98d2fb
1 change: 1 addition & 0 deletions releases/com/mashape/clients/mashape-java-client/2.0.11/mashape-java-client-2.0.11.jar.sha1
View file
@@ -0,0 +1 @@
0ad4e7fec9cbf7b0dea3916f53a9dba4ffc50e91

0 comments on commit 5655e81

Please sign in to comment.