Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Update for clojure v1.3 #12

Open
wants to merge 4 commits into from

1 participant

@roman

Hello Richard,

I sent you a tweet a bit earlier about an upgrade to clojure v1.3 for this library.

I also took the liberty to remove the swank-clojure from :dev-dependencies, the reasons are stated in the commit.

Cheers.

Roman.-

roman added some commits
@roman roman Removing lein-swank as a dev-dependency
Technomancy suggests in the README of leiningen to not put
lein-swank in the projects dev-dependencies but instead install
this via the `lein plugin` utility.
3d3de1d
@roman roman Updating library to clojure version 1.3 5c0c24f
@roman roman Merge branch 'clj-1.3' aeccc38
@roman roman Bumping up the snapshot version to avoid collisions with my custom s3…
… storage
46d3ad4
@roman roman referenced this pull request in mattrepl/clj-oauth
Closed

Update for clojure v1.3 #13

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 8, 2012
  1. @roman

    Removing lein-swank as a dev-dependency

    roman authored
    Technomancy suggests in the README of leiningen to not put
    lein-swank in the projects dev-dependencies but instead install
    this via the `lein plugin` utility.
  2. @roman
  3. @roman

    Merge branch 'clj-1.3'

    roman authored
Commits on Jan 13, 2012
  1. @roman
This page is out of date. Refresh to see the latest.
View
1  .gitignore
@@ -2,3 +2,4 @@
.*sw*
*.jar
*.class
+.lein-*
View
75 pom.xml
@@ -0,0 +1,75 @@
+<?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.twinql.clojure</groupId>
+ <artifactId>clj-apache-http</artifactId>
+ <version>2.3.1</version>
+ <name>clj-apache-http</name>
+ <description>Clojure HTTP library using the Apache HttpClient.</description>
+ <scm>
+ <connection>scm:git:git://github.com/roman/clj-apache-http.git</connection>
+ <developerConnection>scm:git:ssh://git@github.com/roman/clj-apache-http.git</developerConnection>
+ <tag>3d3de1da943ec7dfac5c7c419f5a31efdbf368ff</tag>
+ <url>https://github.com/roman/clj-apache-http</url>
+ </scm>
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>resources</directory>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <directory>test-resources</directory>
+ </testResource>
+ </testResources>
+ </build>
+ <repositories>
+ <repository>
+ <id>central</id>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
+ <repository>
+ <id>clojars</id>
+ <url>http://clojars.org/repo/</url>
+ </repository>
+ </repositories>
+ <dependencies>
+ <dependency>
+ <groupId>org.clojure</groupId>
+ <artifactId>clojure</artifactId>
+ <version>1.3.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.clojure</groupId>
+ <artifactId>data.json</artifactId>
+ <version>0.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+ </dependencies>
+</project>
+<!-- This file was autogenerated by Leiningen.
+ Please do not edit it directly; instead edit project.clj and regenerate it.
+ It should not be considered canonical data. For more information see
+ https://github.com/technomancy/leiningen -->
View
7 project.clj
@@ -1,8 +1,7 @@
-(defproject com.twinql.clojure/clj-apache-http "2.3.1"
+(defproject com.twinql.clojure/clj-apache-http "2.3.2-SNAPSHOT"
:description "Clojure HTTP library using the Apache HttpClient."
- :dev-dependencies [[leiningen/lein-swank "1.1.0"]]
- :dependencies [[org.clojure/clojure "1.2.0"]
- [org.clojure/clojure-contrib "1.2.0"]
+ :dependencies [[org.clojure/clojure "1.3.0"]
+ [org.clojure/data.json "0.1.2"]
[org.apache.httpcomponents/httpcore "4.0.1"]
[org.apache.httpcomponents/httpmime "4.0.1"]
[commons-logging/commons-logging "1.1.1"]
View
10 src/com/twinql/clojure/http.clj
@@ -2,8 +2,8 @@
(:refer-clojure :exclude [get])
(:use clojure.set)
(:require
- [clojure.contrib.io :as io]
- [clojure.contrib.json :as json])
+ [clojure.java.io :as io]
+ [clojure.data.json :as json])
(:import
(java.lang Exception)
(java.net URI)
@@ -205,17 +205,17 @@
(defmethod entity-as :string [#^HttpEntity entity as status]
(with-open [#^InputStream stream (.getContent entity)]
- (io/slurp* stream)))
+ (slurp stream)))
;;; JSON handling.
;;; We prefer keywordizing.
(defmethod entity-as :json [#^HttpEntity entity as status]
(with-open [#^InputStream stream (.getContent entity)]
- (clojure.contrib.json/read-json (io/reader stream) true)))
+ (json/read-json (io/reader stream) true)))
(defmethod entity-as :json-string-keys [#^HttpEntity entity as status]
(with-open [#^InputStream stream (.getContent entity)]
- (clojure.contrib.json/read-json (io/reader stream) false)))
+ (json/read-json (io/reader stream) false)))
;;; To avoid overhead in shutting down a ClientConnectionManager,
Something went wrong with that request. Please try again.